X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/c5417c91647b67e17d0de3bd7f79468f4ffb746a..610c25c1bf15b2c6b4acb662c80b35a59e666c68:/configure1.in

diff --git a/configure1.in b/configure1.in
index e746ac5e4b..2201547e2a 100755
--- a/configure1.in
+++ b/configure1.in
@@ -65,17 +65,17 @@ single_tree=
 prefix='/usr/local'
 exec_prefix='${prefix}'
 bindir='${exec_prefix}/bin'
-datadir='${prefix}/lib'
-statedir='${prefix}/lib'
-libdir='${exec_prefix}/lib'
+datadir='${prefix}/share'
+sharedstatedir='${prefix}/com'
+libexecdir='${exec_prefix}/libexec'
 mandir='${prefix}/man/man1'
 infodir='${prefix}/info'
 lispdir='${datadir}/emacs/${version}/lisp'
 locallisppath='${datadir}/emacs/site-lisp'
 lisppath='${locallisppath}:${lispdir}'
 etcdir='${datadir}/emacs/${version}/etc'
-lockdir='${statedir}/emacs/lock'
-archlibdir='${libdir}/emacs/${version}/${configuration}'
+lockdir='${sharedstatedir}/emacs/lock'
+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}/etc'
 
 # On Sun systems, people sometimes set up the variable CPP
@@ -89,8 +89,8 @@ fi
 # We cannot use this variable in the case statement below, because many
 # /bin/sh's have broken semantics for "case".  Unfortunately, you must
 # actually edit the clause itself.
-# path_options="prefix | exec_prefix | bindir | libdir | etcdir | datadir"
-# path_options="$path_options | archlibdir | statedir | mandir | infodir"
+# path_options="prefix | exec_prefix | bindir | libexecdir | etcdir | datadir"
+# path_options="$path_options | archlibdir | sharedstatedir | mandir | infodir"
 # path_options="$path_options | lispdir | lockdir | lisppath | locallisppath"
 
 #### Usage messages.
@@ -101,7 +101,10 @@ Set compilation and installation parameters for GNU Emacs, and report.
 CONFIGURATION specifies the machine and operating system to build for.
 --with-x		Support the X Window System.
 --with-x=no		Don't support X.
---with-x-toolkit	Use an X toolkit.
+--with-x-toolkit=yes	Use the X toolkit. Default to Lucid/Athena widgets.
+--with-x-toolkit=athena	Use the X toolkit with Athena widgets.
+--with-x-toolkit=lucid	Use the X toolkit with Lucid widgets.
+--with-x-toolkit=motif	Use the X toolkit with Motif widgets.
 --with-x-toolkit=no	Don't use an X toolkit.
 --with-gcc		Use GCC to compile Emacs.
 --with-gcc=no		Don't use GCC to compile Emacs.
@@ -121,7 +124,7 @@ CONFIGURATION specifies the machine and operating system to build for.
 --prefix=DIR		Install files below DIR. Defaults to \`${prefix}'.
 
 You may also specify any of the \`path' variables found in Makefile.in,
-including --bindir, --libdir, --etcdir, --infodir, and so on.  This allows
+including --bindir, --libexecdir, --etcdir, --infodir, and so on.  This allows
 you to override a single default location when configuring.
 
 If successful, ${progname} leaves its status in config.status.  If
@@ -201,8 +204,8 @@ Set it to either \`yes' or \`no'."
 	    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 ;;
 # 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 ;;
 	    * )
@@ -210,7 +213,7 @@ Set it to either \`yes' or \`no'."
 #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'.
+which is \`yes', \`no', \`lucid', \`athena', or \`motif'.
 Currently, \`yes', \`athena' and \`lucid' are synonyms."
 	       echo "${short_usage}") >&2
 	      exit 1
@@ -297,8 +300,8 @@ Set it to either \`yes' or \`no'."
 	;;
 
 	## Has the user specified one of the path options?
-	prefix | exec_prefix | bindir | libdir | etcdir | datadir | \
-	archlibdir | statedir | mandir | infodir | lispdir | lockdir | \
+	prefix | exec_prefix | bindir | libexecdir | etcdir | datadir | \
+	archlibdir | sharedstatedir | mandir | infodir | lispdir | lockdir | \
 	lisppath | locallisppath | docdir )
 	   ## If the value was omitted, get it from the next argument.
 	   if [ "${valomitted}" = "yes" ]; then
@@ -500,10 +503,10 @@ case "${canonical}" in
 
   ## Acorn RISCiX:
   arm-acorn-riscix1.1* )
-    machine=riscix opsys=riscix1-1
+    machine=acorn opsys=riscix1-1
   ;;
   arm-acorn-riscix1.2* | arm-acorn-riscix )
-    machine=riscix opsys=riscix1-2
+    machine=acorn opsys=riscix1-2
   ;;
 
   ## Alliant machines
@@ -1333,6 +1336,12 @@ esac
 [ -n "${x_libraries}" ] && LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
 [ -n "${x_includes}" ] && C_SWITCH_X_SITE="-I${x_includes}"
 
+if [ x"${x_includes}" = x ]; then
+  bitmapdir=/usr/include/X11/bitmaps;
+else
+  bitmapdir="${x_includes}/bitmaps";
+fi
+
 # Avoid forcing the search of /usr/include before fixed include files.
 if [ "$C_SWITCH_X_SITE" = "-I/usr/include" ]; then
    C_SWITCH_X_SITE=" "
@@ -1573,7 +1582,7 @@ AC_ALLOCA
 AC_HAVE_LIBRARY(-lm)
 AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \
 random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \
-strerror fpathconf select)
+strerror fpathconf select mktime eaccess)
 
 ok_so_far=true
 AC_FUNC_CHECK(socket, , ok_so_far=)
@@ -1611,13 +1620,14 @@ fi
 ]
 AC_SUBST(version)
 AC_SUBST(configuration)
+AC_SUBST(canonical)
 AC_SUBST(srcdir)
 AC_SUBST(prefix)
 AC_SUBST(exec_prefix)
 AC_SUBST(bindir)
 AC_SUBST(datadir)
-AC_SUBST(statedir)
-AC_SUBST(libdir)
+AC_SUBST(sharedstatedir)
+AC_SUBST(libexecdir)
 AC_SUBST(mandir)
 AC_SUBST(infodir)
 AC_SUBST(lispdir)
@@ -1627,6 +1637,7 @@ AC_SUBST(etcdir)
 AC_SUBST(lockdir)
 AC_SUBST(archlibdir)
 AC_SUBST(docdir)
+AC_SUBST(bitmapdir)
 AC_SUBST(c_switch_system)
 AC_SUBST(c_switch_machine)
 AC_SUBST(LD_SWITCH_X_SITE)
@@ -1637,7 +1648,7 @@ AC_SUBST(X_TOOLKIT_TYPE)
 AC_SUBST(machfile)
 AC_SUBST(opsysfile)
 
-AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "\"${configuration}\"")
+AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "\"${canonical}\"")
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS,  "\"${config_options}\"")
 AC_DEFINE_UNQUOTED(config_machfile,  "\"${machfile}\"")
 AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
@@ -1700,11 +1711,11 @@ elif [ "$single_tree" = "1" ]; then
    if [ "$datadir_specified" = "" ]; then
       datadir='${prefix}/common'
    fi
-   if [ "$statedir_specified" = "" ]; then
-      statedir='${prefix}/common'
+   if [ "$sharedstatedir_specified" = "" ]; then
+      sharedstatedir='${prefix}/common'
    fi
-   if [ "$libdir_specified" = "" ]; then
-      libdir='${bindir}'
+   if [ "$libexecdir_specified" = "" ]; then
+      libexecdir='${bindir}'
    fi
    if [ "$lispdir_specified" = "" ]; then
       lispdir='${prefix}/common/lisp'
@@ -1716,7 +1727,7 @@ elif [ "$single_tree" = "1" ]; then
       lockdir='${prefix}/common/lock'
    fi
    if [ "$archlibdir_specified" = "" ]; then
-      archlibdir='${libdir}/etc'
+      archlibdir='${libexecdir}/etc'
    fi
    if [ "$etcdir_specified" = "" ]; then
       etcdir='${prefix}/common/data'