(Fyes_or_no_p): Call Fx_popup_dialog instead of Fx_popup_menu.

[bpt/emacs.git] / configure1.in

diff --git a/configure1.in b/configure1.in
index ce74228..2cae7c6 100755 (executable)
--- a/configure1.in
+++ b/configure1.in
@@ -79,7 +79,7 @@ lisppath='${locallisppath}:${lispdir}'
 etcdir='${datadir}/emacs/${version}/etc'
 lockdir='${statedir}/emacs/lock'
 archlibdir='${libdir}/emacs/${version}/${configuration}'
-docdir='${libdir}/emacs/${version}/etc'
+docdir='${datadir}/emacs/${version}/etc'
 
 # On Sun systems, people sometimes set up the variable CPP
 # with a value that is a directory, not an executable at all.
@@ -198,18 +198,21 @@ Set it to either \`yes' or \`no'."
 
         ## Has the user specified which toolkit they want to support?
         "with_x_toolkit" )
-         ## Make sure the value given was either "yes" or "no".
          case "${val}" in
            y | ye | yes )      val=athena ;;
            n | no )            val=no  ;;
            l | lu | luc | luci | lucid )       val=lucid ;;
            a | at | ath | athe | athena )      val=athena ;;
-           m | mo | mot | moti | motif )       val=motif ;;
-           o | op | ope | open | open- | open-l | open-lo \
-               | open-loo | open-look )        val=open-look ;;
+# These don't currently work.
+#          m | mo | mot | moti | motif )       val=motif ;;
+#          o | op | ope | open | open- | open-l | open-lo \
+#              | open-loo | open-look )        val=open-look ;;
            * )
-             (echo "${progname}: the \`--${optname}' option is supposed to have a value
-which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'."
+             (
+#echo "${progname}: the \`--${optname}' option is supposed to have a value
+#which is \`yes', \`no', \`lucid', \`athena', \`motif' or \`open-look'."
+echo "${progname}: the \`--${optname}' option is supposed to have a value
+which is \`yes', \`no', \`lucid', or \`athena'."
               echo "${short_usage}") >&2
              exit 1
            ;;
@@ -715,6 +718,9 @@ case "${canonical}" in
   rs6000-ibm-aix3.1* )
     machine=ibmrs6000 opsys=aix3-1
   ;;
+  rs6000-ibm-aix3.2.5)
+    machine=ibmrs6000 opsys=aix3-2-5
+  ;;
   rs6000-ibm-aix3.2* | rs6000-ibm-aix* )
     machine=ibmrs6000 opsys=aix3-2
   ;;
@@ -1012,6 +1018,7 @@ case "${canonical}" in
       *-sco3.2v4* )            opsys=sco4 ;;
       *-bsd386* )              opsys=bsd386 ;;
       *-386bsd* )              opsys=386bsd ;;
+      *-freebsd* )             opsys=freebsd ;;
       *-netbsd* )              opsys=netbsd ;;
       *-nextstep* )             opsys=mach2 ;;
       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
@@ -1039,6 +1046,9 @@ if [ x"${opsys}" = x ]; then
     *-sysv2.2 | *-sysvr2.2 )           opsys=usg5-2-2 ;;
     *-sysv3 | *-sysvr3 )               opsys=usg5-3 ;;
     *-sysv4 | *-sysvr4 )               opsys=usg5-4 ;;
+    *-sysv4.1 | *-sysvr4.1 )
+       NON_GNU_CPP=/usr/lib/cpp
+       opsys=usg5-4 ;;
     *-sysv4.2 | *-sysvr4.2 )           opsys=usg5-4-2 ;;
     * )
       unported=true
@@ -1356,7 +1366,8 @@ fi
 if test "${HAVE_X11}" = "yes"; then
   DEFS="$C_SWITCH_X_SITE $DEFS"
   LIBS="$LD_SWITCH_X_SITE $LIBX $LIBS"
-  AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString XScreenNumberOfScreen XSetWMProtocols)
+  AC_HAVE_FUNCS(XrmSetDatabase XScreenResourceString \
+XScreenNumberOfScreen XSetWMProtocols)
 fi
 
 AC_ALLOCA
@@ -1364,7 +1375,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 bcopy bcmp logb frexp fmod drem ftime res_init setsid strerror)
+random bcopy bcmp logb frexp fmod drem ftime res_init setsid strerror \
+fpathconf)
 
 ok_so_far=true
 AC_FUNC_CHECK(socket, , ok_so_far=)
@@ -1471,7 +1483,7 @@ if [ "$run_in_place" = "1" ]; then
    etcdir='${srcdir}/etc'
    lockdir='${srcdir}/lock'
    archlibdir=`(cd lib-src && pwd)`
-   docdir=$archlibdir
+   docdir=`(cd etc && pwd)`
    infodir='${srcdir}/info'
 elif [ "$single_tree" = "1" ]; then
    if [ "$exec_prefix_specified" = "" ]; then