(Fset_window_point): If displaying cursors in windows

[bpt/emacs.git] / configure.in

diff --git a/configure.in b/configure.in
index 28c1e7f..00ea9c8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -192,7 +192,7 @@ case "${canonical}" in
       mipsel-*-netbsd*)        machine=pmax ;;
       ns32k-*-netbsd*) machine=ns32000 ;;
       powerpc-*-netbsd*) machine=macppc ;;
-      sparc-*-netbsd*) machine=sparc ;;
+      sparc*-*-netbsd*)        machine=sparc ;;
       vax-*-netbsd*)   machine=vax ;;
       arm-*-netbsd*)   machine=arm ;;
     esac
@@ -228,7 +228,7 @@ case "${canonical}" in
     case "${canonical}" in
       i[345]86-*-bsdi*) machine=intel386 ;;
       sparc-*-bsdi*)  machine=sparc ;;
-      powerpc-*-bsdi*)  machine=powerpc ;;
+      powerpc-*-bsdi*)  machine=macppc ;;
     esac
     case "${canonical}" in
       *-*-bsd386* | *-*-bsdi1* )       opsys=bsd386 ;;
@@ -258,13 +258,13 @@ 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
-    # This is necessary on 5.0 to avoid mangling src/Makefile due to
-    # non-traditional preprocessing with the current compiler defaults.
-    # OSF 4 can also have that compiler version, and there seems always
-    # to have been a usable /usr/bin/cpp.
-    NON_GNU_CPP='cpp'
+    # NON_GNU_CPP is necessary on 5.0 to avoid mangling src/Makefile
+    # due to non-traditional preprocessing with the current compiler
+    # defaults.  OSF 4 can also have that compiler version, and there
+    # seems always to have been a usable /usr/bin/cpp.
+    NON_GNU_CPP=/usr/bin/cpp
     case "${canonical}" in
-    alpha*-dec-osf[4-9]*)
+    alpha*-dec-osf[5-9]*)
       opsys=osf5-0 ;;
     esac
   ;;
@@ -279,7 +279,7 @@ case "${canonical}" in
 
   ppc-*-linux | \
   powerpc-*-linux* )
-    machine=powerpc opsys=gnu-linux
+    machine=macppc opsys=gnu-linux
   ;;
 
   ## Altos 3068
@@ -1228,6 +1228,12 @@ configure___ system_malloc=yes
 configure___ system_malloc=no
 #endif
 
+#ifdef USE_MMAP_FOR_BUFFERS
+configure___ use_mmap_for_buffers=yes
+#else
+configure___ use_mmap_for_buffers=no
+#endif
+
 #ifndef C_DEBUG_SWITCH
 #define C_DEBUG_SWITCH -g
 #endif
@@ -1538,6 +1544,15 @@ if test x"${REL_ALLOC}" = x; then
   REL_ALLOC=${GNU_MALLOC}
 fi
 
+dnl For now, need to use an explicit `#define USE_MMAP_FOR_BUFFERS 1'
+dnl the system configuration file (s/*.h) to turn the use of mmap
+dnl in the relocating allocator on.
+
+AC_FUNC_MMAP
+if test $use_mmap_for_buffers = yes; then
+  REL_ALLOC=no
+fi
+
 LIBS="$libsrc_libs $LIBS"
 
 dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
@@ -1720,6 +1735,7 @@ Motif version prior to 2.1.
     emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no))
   HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
   if test $emacs_cv_motif_version_2_1 = yes; then
+    HAVE_LIBXP=no
     AC_DEFINE(HAVE_MOTIF_2_1)
     AC_CHECK_LIB(Xp, XpCreateContext, HAVE_LIBXP=yes, , -lXext)
     if test ${HAVE_LIBXP} = yes; then
@@ -1824,7 +1840,7 @@ if test "${HAVE_X11}" = "yes"; then
     old_c_flags="${CFLAGS}"
     CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}"
     AC_CHECK_HEADER(png.h,
-      AC_CHECK_LIB(png, png_set_expand, HAVE_PNG=yes, , -lX11 -lz -lm))
+      AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lX11 -lz -lm))
     CFLAGS="${old_c_flags}"
   fi
 
@@ -1913,7 +1929,8 @@ rename closedir mkdir rmdir sysinfo \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
 utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \
-__fpending mblen mbrlen strsignal setitimer ualarm index rindex)
+__fpending mblen mbrlen strsignal setitimer ualarm index rindex \
+gai_strerror mkstemp)
 
 AC_FUNC_MKTIME
 if test "$ac_cv_func_working_mktime" = no; then
@@ -1922,10 +1939,9 @@ fi
 
 AC_FUNC_GETLOADAVG
 
-AC_CHECK_FUNCS(ftello)
+AC_FUNC_FSEEKO
 
-# UNIX98 PTYs.  AC_SYS_LARGEFILE should have defined _XOPEN_SOURCE
-# if we need it.
+# UNIX98 PTYs.
 AC_CHECK_FUNCS(grantpt)
 
 # PTY-related GNU extensions.
@@ -2179,7 +2195,8 @@ Configured for \`${canonical}'.
         \`${opsysfile}' and \`${machfile}'
   What compiler should emacs be built with?               ${CC} ${CFLAGS}
   Should Emacs use the GNU version of malloc?             ${GNU_MALLOC}${GNU_MALLOC_reason}
-  Should Emacs use the relocating allocator for buffers?  ${REL_ALLOC}
+  Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}
+  Should Emacs use mmap(2) for buffer allocation?         $use_mmap_for_buffers
   What window system should Emacs use?                    ${window_system}
   What toolkit should Emacs use?                          ${USE_X_TOOLKIT}"
 
@@ -2240,6 +2257,13 @@ changequote([, ])dnl
 echo creating src/epaths.h
 make epaths-force
 
+# As of 2000-11-19, newest development versions of GNU cpp preprocess
+# `..' to `. .'  unless invoked with -traditional
+
+if test "x$GCC" = xyes && test "x$NON_GNU_CPP" = x; then
+  CPPFLAGS="$CPPFLAGS -traditional"
+fi
+
 echo creating lib-src/Makefile
 ( cd lib-src
   rm -f junk.c junk1.c junk2.c
@@ -2280,4 +2304,5 @@ fi
 # This is how we know whether to re-run configure in certain cases.
 touch src/config.stamp
 
-], [CPP="$CPP" CPPFLAGS="$CPPFLAGS"])
+], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS"])
+