dnl GNU General Public License for more details.
dnl
dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Emacs; see the file COPYING. If not, write to
-dnl the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl along with GNU Emacs; see the file COPYING. If not, write to the
+dnl Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+dnl Boston, MA 02111-1307, USA.
AC_PREREQ(2.8)dnl
AC_INIT(src/lisp.h)
dnl added later on when we find the path of X, and it's best to
dnl keep them together visually.
AC_ARG_WITH(x-toolkit,
-[ --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif)],
+[ --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif/no)],
[ case "${withval}" in
y | ye | yes ) val=athena ;;
n | no ) val=no ;;
vpath %.y $(srcdir)\
vpath %.l $(srcdir)\
vpath %.s $(srcdir)\
-vpath %.in $(srcdir)'
+vpath %.in $(srcdir)\
+vpath %.texi $(srcdir)'
fi
#### Given the configuration name, set machfile and opsysfile to the
*-*-netbsd* )
opsys=netbsd
case "${canonical}" in
- i[345]86-*-netbsd*) machine=intel386 ;;
+ i[3456]86-*-netbsd*) machine=intel386 ;;
m68k-*-netbsd*)
# This is somewhat bogus.
machine=hp9000s300 ;;
machine=alpha opsys=osf1
;;
- alpha-*-linux* | alpha-*-lignux* )
- machine=alpha opsys=lignux
+ alpha-*-linux-gnu* )
+ machine=alpha opsys=gnu-linux
;;
## Altos 3068
;;
## Cubix QBx/386
- i[345]86-cubix-sysv* )
+ i[3456]86-cubix-sysv* )
machine=intel386 opsys=usg5-3
;;
;;
## IBM machines
- i[345]86-ibm-aix1.1* )
+ i[3456]86-ibm-aix1.1* )
machine=ibmps2-aix opsys=usg5-2-2
;;
- i[345]86-ibm-aix1.[23]* | i[345]86-ibm-aix* )
+ i[3456]86-ibm-aix1.[23]* | i[3456]86-ibm-aix* )
machine=ibmps2-aix opsys=usg5-3
;;
i370-ibm-aix*)
;;
## Intel 386 machines where we do care about the manufacturer
- i[345]86-intsys-sysv* )
+ i[3456]86-intsys-sysv* )
machine=is386 opsys=usg5-2-2
;;
## Prime EXL
- i[345]86-prime-sysv* )
+ i[3456]86-prime-sysv* )
machine=i386 opsys=usg5-3
;;
## Sequent Symmetry running Dynix
- i[345]86-sequent-bsd* )
+ i[3456]86-sequent-bsd* )
machine=symmetry opsys=bsd4-3
;;
## Sequent Symmetry running DYNIX/ptx
## Use the old cpp rather than the newer ANSI one.
- i[345]86-sequent-ptx* )
+ i[3456]86-sequent-ptx* )
machine=sequent-ptx opsys=ptx
NON_GNU_CPP="/lib/cpp"
;;
+ ## ncr machine running svr4.3.
+ i[3456]86-ncr-sysv4.3 )
+ machine=ncr386 opsys=usg5-4-3
+ ;;
+
## Unspecified sysv on an ncr machine defaults to svr4.2.
## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
- i[345]86-ncr-sysv* )
+ i[3456]86-ncr-sysv* )
machine=ncr386 opsys=usg5-4-2
;;
machine=iris4d opsys=irix4-0
;;
mips-sgi-irix6* )
- machine=iris4d opsys=irix6-0 NON_GNU_CPP=/lib/cpp
+ machine=iris4d opsys=irix6-0
+ NON_GNU_CPP=/lib/cpp
+ NON_GCC_TEST_OPTIONS=-32
;;
mips-sgi-irix5.[01]* )
machine=iris4d opsys=irix5-0
;;
## Suns
+ sparc-*-linux-gnu* )
+ machine=sparc opsys=gnu-linux
+ ;;
+
*-sun-sunos* | *-sun-bsd* | *-sun-solaris* \
- | i[345]86-*-solaris2* | i[345]86-*-sunos5* | powerpc*-*-solaris2* \
+ | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
| rs6000-*-solaris2*)
case "${canonical}" in
m68*-sunos1* ) machine=sun1 ;;
m68*-sunos2* ) machine=sun2 ;;
m68* ) machine=sun3 ;;
- i[345]86-sun-sunos[34]* ) machine=sun386 ;;
- i[345]86-*-* ) machine=intel386 ;;
- powerpc* | rs6000* ) machine=rs6000 ;;
+ i[3456]86-sun-sunos[34]* ) machine=sun386 ;;
+ i[3456]86-*-* ) machine=intel386 ;;
+ powerpc* | rs6000* ) machine=ibmrs6000 ;;
sparc* ) machine=sparc ;;
* ) unported=yes ;;
esac
case "${canonical}" in
## The Sun386 didn't get past 4.0.
- i[345]86-*-sunos4 ) opsys=sunos4-0 ;;
+ i[3456]86-*-sunos4 ) opsys=sunos4-0 ;;
*-sunos4.0* ) opsys=sunos4-0 ;;
*-sunos4.1.[3-9]* | *-sunos4shr*)
opsys=sunos4shr
NON_GNU_CPP=/usr/lib/cpp
;;
- *-sunos4.1.[3-9]*-noshare )
+ *-sunos4.1.[3-9]*noshare )
opsys=sunos4-1-3
NON_GNU_CPP=/usr/lib/cpp
NON_GCC_TEST_OPTIONS=-Bstatic
;;
## Intel 386 machines where we don't care about the manufacturer
- i[345]86-*-* )
+ i[3456]86-*-* )
machine=intel386
case "${canonical}" in
*-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
*-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
*-esix* ) opsys=esix ;;
*-xenix* ) opsys=xenix ;;
- *-linux* | *-lignux* ) opsys=lignux ;;
+ *-linux-gnu* ) opsys=gnu-linux ;;
*-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;;
+ *-sco3.2v5* ) opsys=sco5
+ NON_GNU_CPP=/lib/cpp
+ # Prevent -belf from being passed to $CPP.
+ # /lib/cpp does not accept it.
+ OVERRIDE_CPPFLAGS=
+ ;;
*-bsd386* | *-bsdi1* ) opsys=bsd386 ;;
- *-bsdi2* ) opsys=bsdos2 ;;
+ *-bsdi2.0* ) opsys=bsdos2 ;;
+ *-bsdi2* ) opsys=bsdos2-1 ;;
*-386bsd* ) opsys=386bsd ;;
*-freebsd* ) opsys=freebsd ;;
*-nextstep* ) opsys=nextstep ;;
esac
;;
- ## Lignux/68k
- m68k-*-linux* | m68k-*-lignux* )
- machine=m68k opsys=lignux
+ ## Linux/68k-based GNU system
+ m68k-*-linux-gnu* )
+ machine=m68k opsys=gnu-linux
;;
* )
### and REAL_CFLAGS (which we use for real compilation).
### The two are the same except on a few systems, where they are made
### different to work around various lossages. For example,
-### GCC 2.5 on Lignux needs them to be different because it treats -g
+### GCC 2.5 on GNU/Linux needs them to be different because it treats -g
### as implying static linking.
### If the CFLAGS env var is specified, we use that value
#### Add the libraries to LIBS and check for some functions.
-CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
+if test x"${OVERRIDE_CPPFLAGS}" != x; then
+ CPPFLAGS="$(OVERRIDE_CPPFLAGS)"
+else
+ CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
+fi
+
LIBS="$libsrc_libs $LIBS"
dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
export LD_RUN_PATH
fi
- if test "${opsys}" = "lignux"; then
+ if test "${opsys}" = "gnu-linux"; then
AC_MSG_CHECKING(whether X on GNU/Linux needs -b to link)
AC_TRY_LINK([],
[XOpenDisplay ("foo");],
[AC_MSG_RESULT(before 6)])
fi
-if test x"${USE_X_TOOLKIT}" = xmaybe; then
+if test "${window_system}" = "x11"; then
AC_MSG_CHECKING(X11 version 5)
AC_TRY_LINK([#include <X11/Xlib.h>],
[#if XlibSpecificationRelease < 5
fail;
#endif
-], [AC_MSG_RESULT(5 or newer; use toolkit by default)
- USE_X_TOOLKIT=LUCID
+], [AC_MSG_RESULT(5 or newer)
+ HAVE_X11R5=yes
AC_DEFINE(HAVE_X11R5)],
- [AC_MSG_RESULT(before 5; do not use toolkit by default)
- USE_X_TOOLKIT=none])
+ [
+ HAVE_X11R5=no
+ AC_MSG_RESULT(before 5)])
+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"${HAVE_X11R5}" = xyes; then
+ AC_MSG_CHECKING(X11 version 5 with Xaw)
+ AC_TRY_LINK([
+#include <X11/Intrinsic.h>
+#include <X11/Xaw/Simple.h>],
+ [],
+ [AC_MSG_RESULT(5 or newer, with Xaw; use toolkit by default)
+ USE_X_TOOLKIT=LUCID],
+ [AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
+ USE_X_TOOLKIT=none])
+ else
+ USE_X_TOOLKIT=none
+ fi
fi
X_TOOLKIT_TYPE=$USE_X_TOOLKIT
AC_CHECK_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \
random lrand48 bcopy bcmp logb frexp fmod ftime res_init setsid \
-strerror fpathconf select mktime eaccess getpagesize tzset setlocale)
+strerror fpathconf select mktime euidaccess getpagesize tzset setlocale)
# Check this now, so that we will NOT find the above functions in ncurses.
# That is because we have not set up to link ncurses in lib-src.
HCoop / bpt / emacs.git / blobdiff