(outline-mode): Remove ^ from paragraph-start & paragraph-separate.

[bpt/emacs.git] / configure.in

diff --git a/configure.in b/configure.in
index 6b75ffa..4159721 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -21,9 +21,21 @@ archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}/etc'
 
 AC_ARG_WITH(gcc,
-[  --with-gcc              Use GCC to compile Emacs])
+[  --with-gcc              use GCC to compile Emacs])
+AC_ARG_WITH(pop,
+[  --with-pop              support POP for mail retrieval],
+[AC_DEFINE(MAIL_USE_POP)])
+AC_ARG_WITH(kerberos,
+[  --with-kerberos         support Kerberos-authenticated POP],
+[AC_DEFINE(KERBEROS)])
+AC_ARG_WITH(hesiod,
+[  --with-hesiod           support Hesiod to get the POP server host],
+[AC_DEFINE(HESIOD)])
+dnl This should be the last --with option, because --with-x is
+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)],
 [        case "${withval}" in
            y | ye | yes )      val=athena ;;
            n | no )            val=no  ;;
@@ -172,7 +184,7 @@ case "${canonical}" in
 
   ## Appallings - I mean, Apollos - running Domain
   m68*-apollo* )
-    machine=apollo opsys=bsd4-2
+    machine=apollo opsys=domain NON_GNU_CPP=/usr/lib/cpp
   ;;
 
   ## AT&T 3b2, 3b5, 3b15, 3b20
@@ -271,7 +283,11 @@ case "${canonical}" in
     fi
   ;;
   m88k-motorola-sysv4* )
-    machine=delta88k opsys=usg5-4
+    # jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110
+    # needs POSIX_SIGNALS and therefore needs usg5-4-2.
+    # I hope there are not other 4.0 versions for this machine
+    # which really need usg5-4 instead.
+    machine=delta88k opsys=usg5-4-2
   ;;
   m88k-motorola-sysv* | m88k-motorola-m88kbcs* )
     machine=delta88k opsys=usg5-3
@@ -394,6 +410,12 @@ case "${canonical}" in
   rs6000-ibm-aix3.2.5 | powerpc-ibm-aix3.2.5 )
     machine=ibmrs6000 opsys=aix3-2-5
   ;;
+  rs6000-ibm-aix4.1* | powerpc-ibm-aix4.1*  )
+    machine=ibmrs6000 opsys=aix4-1
+  ;;
+  rs6000-ibm-aix4* | powerpc-ibm-aix4*  )
+    machine=ibmrs6000 opsys=aix4
+  ;;
   rs6000-ibm-aix* | powerpc-ibm-aix* )
     machine=ibmrs6000 opsys=aix3-2
   ;;
@@ -574,6 +596,9 @@ case "${canonical}" in
   mips-sgi-irix4* )
     machine=iris4d opsys=irix4-0
   ;;
+  mips-sgi-irix6* )
+    machine=iris4d opsys=irix6-0
+  ;;
   mips-sgi-irix5.[01]* )
     machine=iris4d opsys=irix5-0
   ;;
@@ -621,8 +646,11 @@ case "${canonical}" in
       *-sunos4.1.3*      ) opsys=sunos4-1-3
                NON_GCC_TEST_OPTIONS=-Bstatic
                GCC_TEST_OPTIONS=-static
+               NON_GNU_CPP=/usr/lib/cpp
+               ;;
+      *-sunos4shr*       ) opsys=sunos4shr
+               NON_GNU_CPP=/usr/lib/cpp
                ;;
-      *-sunos4shr*       ) opsys=sunos4shr ;;
       *-sunos4* | *-sunos ) opsys=sunos4-1
                NON_GCC_TEST_OPTIONS=-Bstatic
                GCC_TEST_OPTIONS=-static
@@ -721,6 +749,7 @@ case "${canonical}" in
       *-isc1.* | *-isc2.[01]* )        opsys=386-ix ;;
       *-isc2.2* )              opsys=isc2-2 ;;
       *-isc4.0* )              opsys=isc4-0 ;;
+      *-isc4.* )               opsys=isc4-1 ;;
       *-isc* )                 opsys=isc3-0 ;;
       *-esix5* )               opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
       *-esix* )                        opsys=esix ;;
@@ -760,7 +789,11 @@ if test x"${opsys}" = x; then
     *-sysv4.1 | *-sysvr4.1 )
        NON_GNU_CPP=/usr/lib/cpp
        opsys=usg5-4 ;;
-    *-sysv4.2 | *-sysvr4.2 )           opsys=usg5-4-2 ;;
+    *-sysv4.2 | *-sysvr4.2 )
+       if [ x$NON_GNU_CPP = x ]; then
+         NON_GNU_CPP=/usr/ccs/lib/cpp
+       fi
+       opsys=usg5-4-2 ;;
     * )
       unported=yes
     ;;
@@ -833,7 +866,7 @@ dnl checks for Unix variants
 AC_AIX
 
 dnl checks for header files
-AC_CHECK_HEADERS(sys/timeb.h sys/time.h unistd.h utime.h)
+AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h)
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_DECL_SYS_SIGLIST
@@ -897,9 +930,13 @@ else
   window_system=x11
 fi
 
-test "${x_libraries}" != NONE && LD_SWITCH_X_SITE="-L${x_libraries}"
-test "${x_libraries}" != NONE && LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
-test "${x_includes}" != NONE && C_SWITCH_X_SITE="-I${x_includes}"
+if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
+  LD_SWITCH_X_SITE="-L${x_libraries}"
+  LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
+fi
+if test "${x_includes}" != NONE && test -n "${x_includes}"; then
+  C_SWITCH_X_SITE="-I${x_includes}"
+fi
 
 if test x"${x_includes}" = x; then
   bitmapdir=/usr/include/X11/bitmaps
@@ -1183,7 +1220,7 @@ AC_SUBST(machfile)
 AC_SUBST(opsysfile)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}")
-AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${config_options}")
+AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}")
 AC_DEFINE_UNQUOTED(config_machfile,  "${machfile}")
 AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}")
 AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
@@ -1243,13 +1280,11 @@ test "${exec_prefix}" != NONE &&
 changequote([, ])dnl
 
 AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile \
-       lwlib/Makefile src/Makefile.in, [
+       man/Makefile lwlib/Makefile src/Makefile.in, [
 
 ### Make the necessary directories, if they don't exist.
-for dir in ./src ./lib-src ./cpp ./oldXMenu ./lwlib ./etc ; do
-  if test ! -d ${dir}; then
-    mkdir ${dir}
-  fi
+for dir in cpp etc ; do
+  test -d ${dir} || mkdir ${dir}
 done
 
 # Build src/Makefile from ${srcdir}/src/Makefile.in.  This must be done
@@ -1299,4 +1334,10 @@ echo creating src/Makefile
   chmod 444 Makefile.new
   mv -f Makefile.new Makefile
 )
+
+if test ! -f src/.gdbinit && test -f $top_srcdir/src/.gdbinit; then
+  echo creating src/.gdbinit
+  echo source $top_srcdir/src/.gdbinit > src/.gdbinit
+fi
+
 ], [CPP="$CPP" CPPFLAGS="$CPPFLAGS"])