1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
--- configure.in.orig Fri Mar 19 11:20:26 2004
+++ configure.in Fri Mar 19 11:22:24 2004
@@ -36,18 +36,26 @@
dnl A case that the LEIM package does not exist.
dnl
locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
-'${datadir}/emacs/site-lisp'
+'${datadir}/emacs/site-lisp:'\
+'${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
+'${datadir}/emacs/${version}/lisp'
else
dnl
dnl A case that the LEIM package exists.
dnl
locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim'
+'${datadir}/emacs/site-lisp:'\
+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\
+'${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/${version}/leim:'\
+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
+'${datadir}/emacs/${version}/lisp'
fi
lisppath='${locallisppath}:${lispdir}'
-etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
-archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}'
+etcdir='${datadir}/emacs/${version}/etc'
+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
AC_ARG_WITH(gcc,
@@ -224,6 +232,18 @@
machine='' opsys='' unported=no
case "${canonical}" in
+ ## FreeBSD ports
+ *-*-freebsd* )
+ opsys=freebsd
+ case "${canonical}" in
+ alpha*-*-freebsd*) machine=alpha ;;
+ amd64-*-freebsd*) machine=amd64 ;;
+ ia64-*-freebsd*) machine=ia64 ;;
+ i[3456]86-*-freebsd*) machine=intel386 ;;
+ sparc64-*-freebsd*) machine=sparc ;;
+ esac
+ ;;
+
## NetBSD ports
*-*-netbsd* )
opsys=netbsd
@@ -1077,7 +1097,6 @@
;;
*-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
*-386bsd* ) opsys=386bsd ;;
- *-freebsd* ) opsys=freebsd ;;
*-nextstep* ) opsys=nextstep ;;
## Otherwise, we'll fall through to the generic opsys code at the bottom.
esac
@@ -2131,6 +2150,7 @@
# Solaris requires -lintl if you want strerror (which calls dgettext)
# to return localized messages.
AC_CHECK_LIB(intl, dgettext)
+AC_CHECK_LIB(xpg4, _xpg4_setrunelocale)
AC_MSG_CHECKING(whether localtime caches TZ)
AC_CACHE_VAL(emacs_cv_localtime_cache,
|