(Subdirectories in Dired) [ifnottex]: @include dired-xtra.texi.

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index 628bfcad4d1cf8d9d19a67a4a845baef6e72743f..31aebae1a1bf8b896393d292d82aca29e956c10c 100644 (file)
--- 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    autoconf
 dnl in the directory containing this script.
 dnl

-dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006

 dnl  Free Software Foundation, Inc.
 dnl
 dnl  This file is part of GNU Emacs.
 dnl  Free Software Foundation, Inc.
 dnl
 dnl  This file is part of GNU Emacs.


@@ -238,6 +238,7 @@ case "${canonical}" in
     case "${canonical}" in
       alpha*-*-freebsd*)       machine=alpha ;;
       i[3456]86-*-freebsd*)    machine=intel386 ;;
     case "${canonical}" in
       alpha*-*-freebsd*)       machine=alpha ;;
       i[3456]86-*-freebsd*)    machine=intel386 ;;

+      amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;

     esac
   ;;
 
     esac
   ;;
 


@@ -610,6 +611,7 @@ dnl see the `changequote' comment above.
   ;;
   hppa*-hp-hpux1[1-9]* )
     machine=hp800 opsys=hpux11
   ;;
   hppa*-hp-hpux1[1-9]* )
     machine=hp800 opsys=hpux11

+    CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"

   ;;
 
   hppa*-*-linux-gnu* )
   ;;
 
   hppa*-*-linux-gnu* )


@@ -653,6 +655,9 @@ dnl see the `changequote' comment above.
   s390-*-linux-gnu* )
     machine=ibms390 opsys=gnu-linux
   ;;
   s390-*-linux-gnu* )
     machine=ibms390 opsys=gnu-linux
   ;;

+  s390x-*-linux-gnu* )
+    machine=ibms390x opsys=gnu-linux
+  ;;

   rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )
     machine=ibmrs6000 opsys=aix3-1
   ;;
   rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )
     machine=ibmrs6000 opsys=aix3-1
   ;;


@@ -1260,6 +1265,23 @@ then
   CC="$CC $NON_GCC_TEST_OPTIONS"
 fi
 
   CC="$CC $NON_GCC_TEST_OPTIONS"
 fi
 

+dnl checks for Unix variants
+AC_AIX
+AC_GNU_SOURCE
+
+### Use -Wno-pointer-sign if the compiler supports it
+AC_MSG_CHECKING([whether gcc understands -Wno-pointer-sign])
+SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wno-pointer-sign"
+AC_TRY_COMPILE([], [], has_option=yes, has_option=no,)
+if test $has_option = yes; then
+   C_WARNINGS_SWITCH="-Wno-pointer-sign $C_WARNINGS_SWITCH"
+fi
+AC_MSG_RESULT($has_option)
+CFLAGS="$SAVE_CFLAGS"
+unset has_option
+unset SAVE_CFLAGS
+

 #### Some other nice autoconf tests.
 
 dnl checks for programs
 #### Some other nice autoconf tests.
 
 dnl checks for programs


@@ -1272,6 +1294,8 @@ fi
 AC_PATH_PROG(INSTALL_INFO, install-info)
 AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin)
 AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
 AC_PATH_PROG(INSTALL_INFO, install-info)
 AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin)
 AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)

+dnl Don't use GZIP, which is used by gzip for additional parameters.
+AC_PATH_PROG(GZIP_PROG, gzip)

 
 dnl Add our options to ac_link now, after it is set up.
 
 
 dnl Add our options to ac_link now, after it is set up.
 


@@ -1304,10 +1328,6 @@ AC_LINK_IFELSE([main(){return 0;}],
   LDFLAGS=$late_LDFLAGS
   [AC_MSG_RESULT(no)])
 
   LDFLAGS=$late_LDFLAGS
   [AC_MSG_RESULT(no)])
 

-dnl checks for Unix variants
-AC_AIX
-
-

 #### Extract some information from the operating system and machine files.
 
 AC_CHECKING([the machine- and system-dependent files to find out
 #### Extract some information from the operating system and machine files.
 
 AC_CHECKING([the machine- and system-dependent files to find out


@@ -1391,6 +1411,10 @@ configure___ use_mmap_for_buffers=no
 #endif
 #endif
 
 #endif
 #endif
 

+#ifndef C_WARNINGS_SWITCH
+#define C_WARNINGS_SWITCH ${C_WARNINGS_SWITCH}
+#endif
+

 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
 #endif
 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
 #endif


@@ -1419,7 +1443,7 @@ configure___ CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
 
 /* Get the CFLAGS for real compilation.  */
 #ifdef __GNUC__
 
 /* Get the CFLAGS for real compilation.  */
 #ifdef __GNUC__

-configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
+configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH '${SPECIFIED_CFLAGS}'

 #else
 configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
 #endif
 #else
 configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
 #endif


@@ -1453,8 +1477,6 @@ fi
 dnl For AC_FUNC_GETLOADAVG, at least:
 AC_CONFIG_LIBOBJ_DIR(src)
 
 dnl For AC_FUNC_GETLOADAVG, at least:
 AC_CONFIG_LIBOBJ_DIR(src)
 

-AC_GNU_SOURCE
-

 dnl Do this early because it can frob feature test macros for Unix-98 &c.
 AC_SYS_LARGEFILE
 
 dnl Do this early because it can frob feature test macros for Unix-98 &c.
 AC_SYS_LARGEFILE
 


@@ -1982,8 +2004,8 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
   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
   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.0.1
-  GTK_REQUIRED=2.0.1
+  GLIB_REQUIRED=2.4
+  GTK_REQUIRED=2.4

   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
   dnl Check if --with-pkg-config-prog has been given.
   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
   dnl Check if --with-pkg-config-prog has been given.


@@ -2158,7 +2180,7 @@ fi
 ### Is -lXaw3d available?
 HAVE_XAW3D=no
 if test "${HAVE_X11}" = "yes"; then
 ### Is -lXaw3d available?
 HAVE_XAW3D=no
 if test "${HAVE_X11}" = "yes"; then

-  if test "${USE_X_TOOLKIT}" != "none"; then
+  if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then

     dnl Fixme: determine what Scrollbar.h needs to avoid compilation
     dnl errors from the test without the `-'.
     AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h,
     dnl Fixme: determine what Scrollbar.h needs to avoid compilation
     dnl errors from the test without the `-'.
     AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h,


@@ -2819,7 +2841,7 @@ if test "${REL_ALLOC}" = "yes" ; then
 fi
 
 AH_TOP([/* GNU Emacs site configuration template file.
 fi
 
 AH_TOP([/* GNU Emacs site configuration template file.

-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 2006

              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.