X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d9b5c99090ff38ef76cbafcfaf44addbc997b80f..1c4594866335a3f7fae1d65e41f2564839b5cb02:/configure.in diff --git a/configure.in b/configure.in index b58e0e7fd2..ade12456eb 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl To rebuild the `configure' script from this, execute the command dnl autoconf dnl in the directory containing this script. dnl -dnl Copyright (C) 1994, 1995, 1996, 1999 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995, 1996, 1999, 2000 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -47,7 +47,7 @@ AC_ARG_WITH(kerberos, [ --with-kerberos support Kerberos-authenticated POP], [AC_DEFINE(KERBEROS)]) AC_ARG_WITH(kerberos5, -[ --with-kerberos5 support Kerberos version 5 authenticated POP], +[ --with-kerberos5 support Kerberos version 5 authenticated POP], [if test "${with_kerberos5+set}" = set; then if test "${with_kerberos+set}" != set; then with_kerberos=yes @@ -93,7 +93,8 @@ AC_ARG_WITH(gif, AC_ARG_WITH(png, [ --with-png use -lpng for displaying PNG images]) AC_ARG_WITH(toolkit-scroll-bars, -[ --without-toolkit-scroll-bars don't use Motif or Xaw3d scroll bars]) +[ --without-toolkit-scroll-bars + don't use Motif or Xaw3d scroll bars]) #### Make srcdir absolute, if it isn't already. It's important to #### avoid running the path through pwd unnecessary, since pwd can @@ -186,9 +187,12 @@ case "${canonical}" in machine=hp9000s300 ;; powerpc-apple-netbsd*) machine=macppc ;; mips-*-netbsd*) machine=pmax ;; + mipsel-*-netbsd*) machine=pmax ;; ns32k-*-netbsd*) machine=ns32000 ;; + powerpc-*-netbsd*) machine=macppc ;; sparc-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; + arm-*-netbsd*) machine=arm ;; esac ;; @@ -252,6 +256,12 @@ case "${canonical}" in # This is needed to find X11R6.1 libraries for certain tests. NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib + case "${canonical}" in + # This is necessary on 5.0 to avoid mangling src/Makefile. + # Separated out in case it causes problems on earlier versions. + alpha*-dec-osf[5-9]*) + NON_GNU_CPP='cc -E -std0' ;; + esac ;; alpha*-*-linux-gnu* ) @@ -773,7 +783,7 @@ case "${canonical}" in # so that, for instance, grepping for `free' in stdlib.h fails and # AC_HEADER_STD_C fails. (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m). NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C" - NON_GCC_TEST_OPTIONS="-n32 -G0 -D_LANGUAGE_C" + NON_GCC_TEST_OPTIONS="-n32 -D_LANGUAGE_C" ;; mips-sgi-irix6* ) machine=iris4d opsys=irix6-0 @@ -819,7 +829,7 @@ case "${canonical}" in machine=sparc opsys=gnu-linux ;; - *-sun-sunos* | *-sun-bsd* | *-sun-solaris* \ + *-auspex-sunos* | *-sun-sunos* | *-sun-bsd* | *-sun-solaris* \ | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \ | rs6000-*-solaris2*) case "${canonical}" in @@ -1054,10 +1064,6 @@ if test x"${opsys}" = x; then esac fi -if test "x$RANLIB" = x; then - RANLIB=ranlib -fi - changequote([, ])dnl if test $unported = yes; then @@ -1132,6 +1138,9 @@ AC_PROG_LN_S AC_PROG_CPP AC_PROG_INSTALL AC_PROG_YACC +if test "x$RANLIB" = x; then + AC_PROG_RANLIB +fi dnl checks for Unix variants AC_AIX @@ -1199,7 +1208,25 @@ if test $emacs_cv_tm_gmtoff = yes; then fi dnl checks for compiler characteristics + +dnl Testing __STDC__ to determine prototype support isn't good enough. +dnl DEC C, for instance, doesn't define it with default options, and +dnl is used on 64-bit systems (OSF Alphas). Similarly for volatile +dnl and void *. +AC_C_PROTOTYPES +AC_C_VOLATILE AC_C_CONST +dnl This isn't useful because we can't turn on use of `inline' unless +dnl the compiler groks `extern inline'. +dnl AC_C_INLINE +AC_CACHE_CHECK([for void * support], emacs_cv_void_star, + [AC_TRY_COMPILE(, [void * foo;], + emacs_cv_void_star=yes, emacs_cv_void_star=no)]) +if test $emacs_cv_void_star = yes; then + AC_DEFINE(POINTER_TYPE, void) +else + AC_DEFINE(POINTER_TYPE, char) +fi dnl check for Make feature AC_PROG_MAKE_SET @@ -1367,8 +1394,12 @@ configure___ system_malloc=no #endif #ifndef C_OPTIMIZE_SWITCH +#ifdef __GNUC__ +#define C_OPTIMIZE_SWITCH -O2 +#else #define C_OPTIMIZE_SWITCH -O #endif +#endif #ifndef LD_SWITCH_MACHINE #define LD_SWITCH_MACHINE @@ -1457,9 +1488,6 @@ if test x"${REL_ALLOC}" = x; then REL_ALLOC=${GNU_MALLOC} fi -LISP_FLOAT_TYPE=yes - - #### Add the libraries to LIBS and check for some functions. if test x"${OVERRIDE_CPPFLAGS}" != x; then @@ -1708,7 +1736,10 @@ if test "${HAVE_X11}" = "yes"; then if test "${with_jpeg}" != "no"; then old_c_flags="${CFLAGS}" CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" - AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes, , -lX11) + dnl Checking for jpeglib.h can lose becsue of a redefinition of + dnl HAVE_STDLIB_H. + AC_CHECK_HEADER(jerror.h, + AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes, , -lX11)) CFLAGS="${old_c_flags}" fi @@ -1740,7 +1771,10 @@ if test "${HAVE_X11}" = "yes"; then old_c_flags="${CFLAGS}" CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" AC_CHECK_HEADER(tiffio.h, - AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , -lX11 -lm)) + tifflibs="-lX11 -lz -lm" + # At least one tiff package requires the jpeg library. + if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi + AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs)) CFLAGS="${old_c_flags}" fi @@ -1756,7 +1790,7 @@ if test "${HAVE_X11}" = "yes"; then old_c_flags="${CFLAGS}" CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" AC_CHECK_HEADER(gif_lib.h, - AC_CHECK_LIB(ungif, DGifOpenFileName, HAVE_GIF=yes, , -lX11)) + AC_CHECK_LIB(ungif, DGifOpen, HAVE_GIF=yes, , -lX11)) CFLAGS="${old_c_flags}" fi @@ -1812,6 +1846,11 @@ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ utimes setrlimit setpgid getcwd shutdown strftime getaddrinfo \ __fpending ftello getloadavg mblen mbrlen strsignal setitimer ualarm) +AC_FUNC_MKTIME +if test "$ac_cv_func_working_mktime" = no; then + AC_DEFINE(BROKEN_MKTIME) +fi + # 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. # It's better to believe a function is not available @@ -1943,6 +1982,8 @@ else AC_MSG_RESULT(no) fi +AC_FUNC_VFORK + # Set up the CFLAGS for real compilation, so we can substitute it. CFLAGS="$REAL_CFLAGS" @@ -1986,7 +2027,6 @@ AC_SUBST(CFLAGS) AC_SUBST(X_TOOLKIT_TYPE) AC_SUBST(machfile) AC_SUBST(opsysfile) -AC_SUBST(RANLIB) AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}") AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}") @@ -2018,9 +2058,6 @@ fi if test "${REL_ALLOC}" = "yes" ; then AC_DEFINE(REL_ALLOC) fi -if test "${LISP_FLOAT_TYPE}" = "yes" ; then - AC_DEFINE(LISP_FLOAT_TYPE) -fi #### Report on what we decided to do. echo "