X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ef0ce08789edce0f61d408a806d6d598f0d8a0fa..db4042c888b7c793167e3326f5e719ac53445b15:/configure.in diff --git a/configure.in b/configure.in index e6b183b7e9..9d87d8d614 100644 --- a/configure.in +++ b/configure.in @@ -18,8 +18,9 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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) @@ -169,7 +170,9 @@ case "${canonical}" in machine=acorn opsys=riscix1-1 ;; arm-acorn-riscix1.2* | arm-acorn-riscix ) - machine=acorn opsys=riscix1-2 + ## This name is riscix12 instead of riscix1.2 + ## to avoid a file name conflict on MSDOS. + machine=acorn opsys=riscix12 ;; ## Alliant machines @@ -188,6 +191,9 @@ case "${canonical}" in ## Alpha (DEC) machines. alpha-dec-osf* ) machine=alpha opsys=osf1 + # 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 ;; alpha-*-linux-gnu* ) @@ -272,7 +278,9 @@ case "${canonical}" in ## Data General AViiON Machines m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) - machine=aviion opsys=dgux5-4r3 + ## This name is dgux5-4-3 instead of dgux5-4r3 + ## to avoid a file name conflict on MSDOS. + machine=aviion opsys=dgux5-4-3 ;; m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) machine=aviion opsys=dgux5-4r2 @@ -509,6 +517,12 @@ case "${canonical}" in machine=symmetry opsys=bsd4-3 ;; + ## Sequent Symmetry running ptx 4, which is a modified SVR4. + i[3456]86-sequent-ptx4* | i[3456]86-sequent-sysv4* ) + machine=sequent-ptx opsys=ptx4 + NON_GNU_CPP=/lib/cpp + ;; + ## Sequent Symmetry running DYNIX/ptx ## Use the old cpp rather than the newer ANSI one. i[3456]86-sequent-ptx* ) @@ -707,16 +721,18 @@ case "${canonical}" in ## The Sun386 didn't get past 4.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 ) - opsys=sunos4-1-3 + ## This name is sunos413 instead of sunos4-1-3 + ## to avoid a file name conflict on MSDOS. + opsys=sunos413 NON_GNU_CPP=/usr/lib/cpp NON_GCC_TEST_OPTIONS=-Bstatic GCC_TEST_OPTIONS=-static ;; + *-sunos4.1.[3-9]* | *-sunos4shr*) + opsys=sunos4shr + NON_GNU_CPP=/usr/lib/cpp + ;; *-sunos4* | *-sunos ) opsys=sunos4-1 NON_GCC_TEST_OPTIONS=-Bstatic @@ -849,7 +865,7 @@ case "${canonical}" in NON_GNU_CPP=/lib/cpp # Prevent -belf from being passed to $CPP. # /lib/cpp does not accept it. - OVERRIDE_CPPFLAGS= + OVERRIDE_CPPFLAGS=" " ;; *-bsd386* | *-bsdi1* ) opsys=bsd386 ;; *-bsdi2.0* ) opsys=bsdos2 ;; @@ -965,6 +981,16 @@ then CC="$CC $NON_GCC_TEST_OPTIONS" fi +if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x +then + ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" +fi + +if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x +then + ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS" +fi + #### Some other nice autoconf tests. If you add a test here which #### should make an entry in src/config.h, don't forget to add an #### #undef clause to src/config.h.in for autoconf to modify. @@ -979,7 +1005,7 @@ dnl checks for Unix variants AC_AIX dnl checks for header files -AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h linux/version.h termios.h) +AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h linux/version.h sys/systeminfo.h termios.h) AC_HEADER_STDC AC_HEADER_TIME AC_DECL_SYS_SIGLIST @@ -1244,7 +1270,7 @@ LISP_FLOAT_TYPE=yes #### Add the libraries to LIBS and check for some functions. if test x"${OVERRIDE_CPPFLAGS}" != x; then - CPPFLAGS="$(OVERRIDE_CPPFLAGS)" + CPPFLAGS="${OVERRIDE_CPPFLAGS}" else CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS" fi @@ -1412,9 +1438,11 @@ AC_FUNC_ALLOCA # On HPUX 9.01, -lm does not contain logb, so check for sqrt. AC_CHECK_LIB(m, sqrt) -AC_CHECK_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \ +AC_CHECK_FUNCS(gettimeofday gethostname getdomainname dup2 \ +rename closedir mkdir rmdir sysinfo \ random lrand48 bcopy bcmp logb frexp fmod ftime res_init setsid \ -strerror fpathconf select mktime euidaccess getpagesize tzset setlocale) +strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ +utimes setrlimit setpgid) # 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. @@ -1422,6 +1450,13 @@ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale) # than to expect to find it in ncurses. AC_CHECK_LIB(ncurses, tparm) +# These tell us which Kerberos-related libraries to use. +if test "${with_kerberos+set}" = set; then + AC_CHECK_LIB(krb, krb_get_cred) + AC_CHECK_LIB(des, des_cbc_encrypt) + AC_CHECK_LIB(com_err, com_err) +fi + AC_MSG_CHECKING(whether localtime caches TZ) AC_CACHE_VAL(emacs_cv_localtime_cache, [if test x$ac_cv_func_tzset = xyes; then @@ -1437,16 +1472,18 @@ unset_TZ () if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '=')) to++; } +char TZ_GMT0[] = "TZ=GMT0"; +char TZ_PST8[] = "TZ=PST8"; main() { time_t now = time ((time_t *) 0); int hour_GMT0, hour_unset; - if (putenv ("TZ=GMT0") != 0) + if (putenv (TZ_GMT0) != 0) exit (1); hour_GMT0 = localtime (&now)->tm_hour; unset_TZ (); hour_unset = localtime (&now)->tm_hour; - if (putenv ("TZ=PST8") != 0) + if (putenv (TZ_PST8) != 0) exit (1); if (localtime (&now)->tm_hour == hour_GMT0) exit (1); @@ -1645,6 +1682,9 @@ sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ `" changequote([, ])dnl +echo creating src/paths.h +make paths-force + echo creating lib-src/Makefile ( cd lib-src rm -f junk.c junk1.c junk2.c