dnl autoconf
dnl in the directory containing this script.
dnl
-dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-dnl Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003,
+dnl 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Emacs.
dnl
dnl GNU Emacs is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
+dnl the Free Software Foundation; either version 3, or (at your option)
dnl any later version.
dnl
dnl GNU Emacs is distributed in the hope that it will be useful,
esac
;;
+ ## FreeBSD kernel + glibc based userland
+ *-*-kfreebsd*gnu* )
+ opsys=gnu-kfreebsd
+ case "${canonical}" in
+ alpha*-*-kfreebsd*) machine=alpha ;;
+ ia64-*-kfreebsd*) machine=ia64 ;;
+ sparc64-*-kfreebsd*) machine=sparc ;;
+ powerpc-*-kfreebsd*) machine=macppc ;;
+ i[3456]86-*-kfreebsd*) machine=intel386 ;;
+ amd64-*-kfreebsd*|x86_64-*-kfreebsd*) machine=amdx86-64 ;;
+ esac
+ ;;
+
## NetBSD ports
*-*-netbsd* )
opsys=netbsd
machine=nh6000 opsys=powerunix
NON_GNU_CPP="cc -Xo -E -P"
;;
+ ## SR2001/SR2201 running HI-UX/MPP
+ hppa1.1-hitachi-hiuxmpp* )
+ machine=sr2k opsys=hiuxmpp
+ ;;
+ hppa1.1-hitachi-hiuxwe2* )
+ machine=sr2k opsys=hiuxwe2
+ ;;
## Honeywell XPS100
xps*-honeywell-sysv* )
machine=xps100 opsys=usg5-2
esac
;;
+ ## HP 9000 series 700 and 800, running HP/UX
+ hppa*-hp-hpux7* )
+ machine=hp800 opsys=hpux
+ ;;
+ hppa*-hp-hpux8* )
+ machine=hp800 opsys=hpux8
+ ;;
+ hppa*-hp-hpux9shr* )
+ machine=hp800 opsys=hpux9shr
+ ;;
+ hppa*-hp-hpux9* )
+ machine=hp800 opsys=hpux9
+ ;;
+ hppa*-hp-hpux10.2* )
+ machine=hp800 opsys=hpux10-20
+ ;;
+ hppa*-hp-hpux10* )
+ machine=hp800 opsys=hpux10
+ ;;
+ hppa*-hp-hpux1[1-9]* )
+ machine=hp800 opsys=hpux11
+ CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
+ ;;
+
hppa*-*-linux-gnu* )
machine=hp800 opsys=gnu-linux
;;
+ ## HP 9000 series 700 and 800, running HP/UX
+ hppa*-hp-hpux* )
+ ## Cross-compilation? Nah!
+ case "`uname -r`" in
+ ## Someone's system reports A.B8.05 for this.
+ ## I wonder what other possibilities there are.
+ *.B8.* ) machine=hp800 opsys=hpux8 ;;
+ *.08.* ) machine=hp800 opsys=hpux8 ;;
+ *.09.* ) machine=hp800 opsys=hpux9 ;;
+ *) machine=hp800 opsys=hpux10 ;;
+ esac
+ ;;
hppa*-*-nextstep* )
machine=hp800 opsys=nextstep
;;
rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2* )
machine=ibmrs6000 opsys=aix4-2
;;
+ rs6000-ibm-aix4.3* | powerpc-ibm-aix4.3* )
+ machine=ibmrs6000 opsys=aix4-2
+ ;;
rs6000-ibm-aix5* | powerpc-ibm-aix5* )
machine=ibmrs6000 opsys=aix4-2
;;
;;
*-sunos5* | *-solaris* )
opsys=sol2-6
- NON_GNU_CPP=/usr/ccs/lib/cpp
+## FIXME: make this into a proper fix that checks the compiler type,
+## rather than relying on path. Or is /usr/ccs/lib/cpp a bad default now?
+ if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then
+ ## -Xs prevents spurious whitespace.
+ NON_GNU_CPP="/opt/SUNWspro/bin/cc -E -Xs"
+ else
+ NON_GNU_CPP=/usr/ccs/lib/cpp
+ fi
;;
* ) opsys=bsd4-2 ;;
esac
LIBSOUND="$LIBSOUND $ALSA_LIBS"
CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
- AC_SUBST()
fi
AC_SUBST(CFLAGS_SOUND)
fi
if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
fi
- GLIB_REQUIRED=2.4
- GTK_REQUIRED=2.4
+ GLIB_REQUIRED=2.6
+ GTK_REQUIRED=2.6
GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
dnl Check if --with-pkg-config-prog has been given.
AC_CHECK_LIB(pthread, pthread_self, HAVE_GTK_AND_PTHREAD=yes)
fi
if test "$HAVE_GTK_AND_PTHREAD" = yes; then
- GTK_LIBS="$GTK_LIBS -lpthread"
+ case "${canonical}" in
+ *-hpux*) ;;
+ *) GTK_LIBS="$GTK_LIBS -lpthread" ;;
+ esac
AC_DEFINE(HAVE_GTK_AND_PTHREAD, 1,
[Define to 1 if you have GTK and pthread (-lpthread).])
fi
dnl Do not put whitespace before the #include statements below.
dnl Older compilers (eg sunos4 cc) choke on it.
-if test x"${USE_X_TOOLKIT}" = xmaybe; then
+if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
if test x"${HAVE_X11R5}" = xyes; then
AC_MSG_CHECKING(X11 version 5 with Xaw)
AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
USE_X_TOOLKIT=LUCID
else
- AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
- USE_X_TOOLKIT=none
+ if test x"${USE_X_TOOLKIT}" = xLUCID; then
+ AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
+ else
+ AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
+ USE_X_TOOLKIT=none
+ fi
fi
else
USE_X_TOOLKIT=none
fi
AH_TOP([/* GNU Emacs site configuration template file.
- Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,
+ 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
HCoop / bpt / emacs.git / blobdiff