(texinfo-environment-regexp): Match @menu and

[bpt/emacs.git] / configure.in

diff --git a/configure.in b/configure.in
index d3a5e32..5c27dc6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -406,6 +406,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
   ;;
@@ -633,8 +639,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
@@ -733,6 +742,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 ;;
@@ -772,7 +782,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
     ;;
@@ -845,7 +859,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
@@ -1262,10 +1276,8 @@ AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile \
        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
@@ -1315,4 +1327,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"])