(facemenu-update): Reverse the menu order again.

[gnu-emacs] / configure1.in

diff --git a/configure1.in b/configure1.in
index a03c2f58634ff652e8f47e476226823e6f928ed9..640d5264918045bea06aa961579bb0e258ba8875 100755 (executable)
--- a/configure1.in
+++ b/configure1.in
@@ -147,6 +147,7 @@ done
 ### However, it also turns out that many shells cannot expand ${10} at all.
 ### So using an index variable doesn't work either.  It is possible to use
 ### some shell magic to make 'set x "$arguments"; shift' work portably.
+config_options=
 while [ $# != 0 ]; do
   arg="$1"; shift
   case "${arg}" in
@@ -161,6 +162,7 @@ while [ $# != 0 ]; do
          valomitted=no
        ;;
         -*)
+         config_options="${config_options} ${arg}"
           ## If FOO is a boolean argument, --FOO is equivalent to
           ## --FOO=yes.  Otherwise, the value comes from the next
           ## argument - see below.
@@ -484,13 +486,13 @@ case "${canonical}" in
   *-*-netbsd* )
     opsys=netbsd
     case "${canonical}" in
-      sparc-*-netbsd*) machine=sparc ;;
       i[345]86-*-netbsd*) machine=intel386 ;;
-      hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd*)
-                       # Yes, this is somewhat bogus.
+      m68k-*-netbsd*)
+                       # This is somewhat bogus.
                        machine=hp9000s300 ;;
-      pc532-*-netbsd*) machine=ns32000 ;;
-      pmax-*-netbsd*)  machine=pmax ;;
+      mips-*-netbsd*)  machine=pmax ;;
+      ns32k-*-netbsd*) machine=ns32000 ;;
+      sparc-*-netbsd*) machine=sparc ;;
     esac
   ;;
 
@@ -507,6 +509,10 @@ case "${canonical}" in
     machine=alliant-2800 opsys=bsd4-3
   ;;
 
+  alpha-dec-osf* )
+    machine=alpha opsys=osf1
+  ;;
+
   ## Altos 3068
   m68*-altos-sysv* )
     machine=altos opsys=usg5-2
@@ -735,13 +741,13 @@ case "${canonical}" in
   i370-ibm-aix*)
     machine=ibm370aix opsys=usg5-3
   ;;
-  rs6000-ibm-aix3.1* )
+  rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )
     machine=ibmrs6000 opsys=aix3-1
   ;;
-  rs6000-ibm-aix3.2.5)
+  rs6000-ibm-aix3.2.5 | powerpc-ibm-aix3.2.5 )
     machine=ibmrs6000 opsys=aix3-2-5
   ;;
-  rs6000-ibm-aix3.2* | rs6000-ibm-aix* )
+  rs6000-ibm-aix* | powerpc-ibm-aix* )
     machine=ibmrs6000 opsys=aix3-2
   ;;
   romp-ibm-bsd4.3* )
@@ -1522,8 +1528,8 @@ AC_ALLOCA
 # logb and frexp are found in -lm on most systems.
 AC_HAVE_LIBRARY(-lm)
 AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \
-random rand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid strerror \
-fpathconf)
+random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \
+strerror fpathconf)
 
 ok_so_far=true
 AC_FUNC_CHECK(socket, , ok_so_far=)
@@ -1588,6 +1594,7 @@ AC_SUBST(machfile)
 AC_SUBST(opsysfile)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "\"${configuration}\"")
+AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS,  "\"${config_options}\"")
 AC_DEFINE_UNQUOTED(config_machfile,  "\"${machfile}\"")
 AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
 AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})