*** empty log message ***

[gnu-emacs] / configure1.in

diff --git a/configure1.in b/configure1.in
index 07428a892c19374833df73ec83350a27103f0a59..bb140212e0cadfd2ab756acc42f1ac83e6f1c8fa 100755 (executable)
--- a/configure1.in
+++ b/configure1.in
@@ -571,6 +571,12 @@ case "${canonical}" in
   ;;
 
   ## Data General AViiON Machines
+  m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* )
+    machine=aviion opsys=dgux5-4r3
+  ;;
+  m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* )
+    machine=aviion opsys=dgux5-4r2
+  ;;
   m88k-dg-dgux* )
     machine=aviion opsys=dgux
   ;;
@@ -1221,6 +1227,21 @@ case "${window_system}" in
   ;;
 esac
 
+case "${window_system}" in
+  "" | "x11" )
+    ### If the user hasn't specified where we should find X, try
+    ### letting autoconf figure that out.
+    if [ -z "${x_includes}" ] && [ -z "${x_libraries}" ]; then
+      ]
+      AC_FIND_X
+      [
+    fi
+    if [ -n "${x_includes}" ] || [ -n "${x_libraries}" ]; then
+      window_system=x11
+    fi
+  ;;
+esac
+
 [ -z "${window_system}" ] && window_system=none
 
 [ -n "${x_libraries}" ] && LD_SWITCH_X_SITE="-L${x_libraries}"
@@ -1384,9 +1405,9 @@ LIBS="$libsrc_libs"
 dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
 dnl and also adds -ldnet to LIBS, which Autoconf uses for checks.
 AC_HAVE_LIBRARY(-ldnet)
-### This causes -lresolv to get used in subsequent tests,
-### which causes failures on some systems such as HPUX 9.
-### AC_HAVE_LIBRARY(-lresolv)
+dnl This causes -lresolv to get used in subsequent tests,
+dnl which causes failures on some systems such as HPUX 9.
+dnl AC_HAVE_LIBRARY(-lresolv)
 
 AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
 
@@ -1516,8 +1537,10 @@ if [ "$run_in_place" = "1" ]; then
    locallisppath='${srcdir}/site-lisp'
    etcdir='${srcdir}/etc'
    lockdir='${srcdir}/lock'
-   archlibdir=`(cd lib-src && pwd)`
-   docdir=`(cd etc && pwd)`
+   # We used to make archlibdir and docdir absolute,
+   # but that caused trouble with automounters.
+   archlibdir='${srcdir}/lib-src'
+   docdir='${srcdir}/etc'
    infodir='${srcdir}/info'
 elif [ "$single_tree" = "1" ]; then
    if [ "$exec_prefix_specified" = "" ]; then
@@ -1591,7 +1614,7 @@ changequote(,)dnl The horror, the horror.
 # the C preprocessor to some helpful value like 1, or maybe the empty
 # string.  Needless to say consequent macro substitutions are less
 # than conducive to the makefile finding the correct directory.
-undefs="`echo $top_srcdir $configuration |
+undefs="`echo $top_srcdir $configuration $canonical |
 sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/  *$//' \
     -e 's/  */ -U/g' -e 's/-U[0-9][^ ]*//g' \
 `"
@@ -1599,26 +1622,32 @@ changequote([,])dnl
 
 echo creating lib-src/Makefile
 ( cd lib-src
-  rm -f junk.c
-  sed -e 's@^# \(Generated.*\)$@/* \1 */@' \
+  rm -f junk.c junk1.c junk2.c
+  sed -e '/start of cpp stuff/q' \
+      < Makefile.in > junk1.c
+  sed -e '1,/start of cpp stuff/d'\
       -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
       < Makefile.in > junk.c
-  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
-  sed -e 's/^ /        /' -e '/^#/d' -e '/^[   \f]*$/d' > Makefile.new
-  rm -f junk.c
-  chmod 444 Makefile.new;
-  mv -f Makefile.new Makefile;
+  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+      sed -e 's/^ /    /' -e '/^#/d' -e '/^[   \f]*$/d' > junk2.c
+  cat junk1.c junk2.c > Makefile.new
+  rm -f junk.c junk1.c junk2.c
+  chmod 444 Makefile.new
+  mv -f Makefile.new Makefile
 )
 
 echo creating src/Makefile
 ( cd src
-  rm -f junk.c
-  sed -e 's@^# \(Generated.*\)$@/* \1 */@' \
+  rm -f junk.c junk1.c junk2.c
+  sed -e '/start of cpp stuff/q' \
+      < Makefile.in > junk1.c
+  sed -e '1,/start of cpp stuff/d'\
       -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
       < Makefile.in > junk.c
-  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
-  sed -e 's/^ /        /' -e '/^#/d' -e '/^[   \f]*$/d' > Makefile.new
-  rm -f junk.c
-  chmod 444 Makefile.new;
-  mv -f Makefile.new Makefile;
+  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+      sed -e 's/^ /    /' -e '/^#/d' -e '/^[   \f]*$/d' > junk2.c
+  cat junk1.c junk2.c > Makefile.new
+  rm -f junk.c junk1.c junk2.c
+  chmod 444 Makefile.new
+  mv -f Makefile.new Makefile
 )])