lispdir='${datadir}/emacs/${version}/lisp'
locallisppath='${datadir}/emacs/${version}/site-lisp:'\
-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}/leim'
-lisppath='${locallisppath}:${lispdir}'
+'${datadir}/emacs/site-lisp'
+lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
etcdir='${datadir}/emacs/${version}/etc'
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
opsys=freebsd
case "${canonical}" in
alpha*-*-freebsd*) machine=alpha ;;
+ ia64-*-freebsd*) machine=ia64 ;;
+ sparc64-*-freebsd*) machine=sparc ;;
+ powerpc-*-freebsd*) machine=macppc ;;
i[3456]86-*-freebsd*) machine=intel386 ;;
amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
esac
case "${canonical}" in
alpha*-*-openbsd*) machine=alpha ;;
i386-*-openbsd*) machine=intel386 ;;
+ x86_64-*-openbsd*) machine=amdx86-64 ;;
m68k-*-openbsd*) machine=hp9000s300 ;;
mipsel-*-openbsd*) machine=pmax ;;
ns32k-*-openbsd*) machine=ns32000 ;;
AC_SYS_LARGEFILE
+### The standard library on x86-64 GNU/Linux distributions can
+### be located in either /usr/lib64 or /usr/lib.
+case "${canonical}" in
+ x86_64-*-linux-gnu* )
+ if test -d /usr/lib64; then
+ AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
+ [Define to 1 if the file /usr/lib64 exists.])
+fi
+esac
+
dnl This function defintion taken from Gnome 2.0
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
- if $PKG_CONFIG --exists "$2" 2> /dev/null; then
+ if $PKG_CONFIG --exists "$2" 2>&AS_MESSAGE_LOG_FD; then
AC_MSG_RESULT(yes)
succeeded=yes
window_system=x11
fi
-if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
- LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
- LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
+if test "${x_libraries}" != NONE; then
+ if test -n "${x_libraries}"; then
+ LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+ LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
+ fi
x_default_search_path=""
- for x_library in `echo ${x_libraries} | sed -e "s/:/ /g"`; do
+ x_search_path=${x_libraries}
+ if test -z "${x_search_path}"; then
+ x_search_path=/usr/lib
+ fi
+ for x_library in `echo ${x_search_path}: | \
+ sed -e "s/:/ /g" -e p -e "s:/lib[[^ /]]* :/share :g"`; do
x_search_path="\
${x_library}/X11/%L/%T/%N%C%S:\
${x_library}/X11/%l/%T/%N%C%S:\
if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
if test "${with_carbon+set}" != set \
&& test "${carbon_appdir_x+set}" != set; then
- HAVE_CARBON=no
+ for var in with_x with_x_toolkit with_gtk with_xim \
+ with_xpm with_jpeg with_tiff with_gif with_png; do
+ if eval test \"\${$var+set}\" = set; then
+ HAVE_CARBON=no
+ break
+ fi
+ done
fi
fi
if test "${HAVE_CARBON}" = yes; then
fi
# We also have mouse menus.
HAVE_MENUS=yes
-
- tmp_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -framework Carbon"
- AC_CHECK_FUNC(CancelMenuTracking, have_cmt=yes, have_cmt=no)
- if test "$have_cmt" = yes; then
- AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
- [Define to 1 if CancelMenuTracking is available (Mac OSX).])
- fi
- CFLAGS="$tmp_CFLAGS"
fi
### Use session management (-lSM -lICE) if available