(ange-ftp-hash-mark-msgs): Make match more general.

[gnu-emacs] / configure1.in

diff --git a/configure1.in b/configure1.in
index 630f3f23905fffa88bdd480e5601706d4a5f9913..f28bc9e0a51938e27011d13c6724cc008d7569e3 100755 (executable)
--- a/configure1.in
+++ b/configure1.in
@@ -212,7 +212,7 @@ Set it to either \`yes' or \`no'."
               echo "${short_usage}") >&2
              exit 1
            fi
-            val="$1"; shift
+           val="$1"; shift
          fi
           srcdir="${val}"
        ;;
@@ -256,6 +256,12 @@ Set it to either \`yes' or \`no'."
          run_in_place=1
        ;;
 
+        ## Should this use the "single tree" configuration?
+       "single_tree" )
+          run_in_place=
+          single_tree=1
+       ;;
+
        ## Has the user specified one of the path options?
        prefix | exec_prefix | bindir | libdir | etcdir | datadir | \
        archlibdir | statedir | mandir | infodir | lispdir | lockdir | \
@@ -393,6 +399,9 @@ if [ `pwd` != `(cd ${srcdir} && pwd)` ] \
   extrasub='/^VPATH[    ]*=/c\
 vpath %.c $(srcdir)\
 vpath %.h $(srcdir)\
+vpath %.y $(srcdir)\
+vpath %.l $(srcdir)\
+vpath %.s $(srcdir)\
 vpath %.in $(srcdir)'
 fi
 
@@ -695,6 +704,11 @@ case "${canonical}" in
     machine=symmetry opsys=bsd4-3
   ;;
 
+  ## Unspecified sysv on an ncr machine defaults to svr4.
+  i[34]86-ncr-sysv* )
+    machine=intel386 opsys=usg5-4
+  ;;
+
   ## Intel 860
   i860-*-sysvr4* )
     machine=i860 opsys=usg5-4
@@ -996,7 +1010,7 @@ AC_PROG_YACC
 dnl checks for UNIX variants that set `DEFS'
 
 dnl checks for header files
-AC_HAVE_HEADERS(sys/timeb.h sys/time.h)
+AC_HAVE_HEADERS(sys/timeb.h sys/time.h unistd.h)
 AC_STDC_HEADERS
 AC_TIME_WITH_SYS_TIME
 
@@ -1016,7 +1030,6 @@ AC_LONG_FILE_NAMES
 dnl other checks for UNIX variants
 [
 
-
 #### Choose a window system.
 echo "Checking window system."
 
@@ -1328,7 +1341,7 @@ fi
 
 if [ "$run_in_place" = "1" ]; then
    lispdir='${srcdir}/lisp'
-   locallisppath='${srcdir}/site-lisp:${datadir}/emacs/site-lisp'
+   locallisppath='${srcdir}/site-lisp'
    etcdir='${srcdir}/etc'
    lockdir='${srcdir}/lock'
    archlibdir='${srcdir}/lib-src'
@@ -1389,8 +1402,7 @@ test -n "${prefix}" &&
 test -n "${exec_prefix}" &&
   exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
 ]
-AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile src/Makefile.in)
-[
+AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile src/Makefile.in) [
 # Build src/Makefile from ${srcdir}/src/Makefile.in.  This must be done
 # after src/config.h is built, since we rely on that file.  Only do the
 # build if "config.status" is present, since it's non-presence indicates
@@ -1400,10 +1412,15 @@ if [ ! -f ./config.status ]; then
    exit $status
 fi
 topsrcdir=${srcdir}
+  # We discard all lines in Makefile.in that start with `# Generated' or /**/#
+  # because some cpps get confused by them.
+  # Really we should preserve them somehow into Makefile,
+  # but that is beyond my level of shell programming.
 makefile_command='echo "creating src/Makefile";
   topsrcdir='"${topsrcdir}"';
 ( cd ./src;
-  cp Makefile.in junk.c;
+  rm -f junk.c;
+  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
   eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
   < junk.cpp                                                   '\
 '    sed -e '\''s/^#.*//'\''                                   '\
@@ -1411,7 +1428,6 @@ makefile_command='echo "creating src/Makefile";
 '      -e '\''s/^ /    /'\''                                   '\
 '      | sed -n -e '\''/^..*$/p'\''                            '\
 '      > Makefile.new;
-    : 'There is a window of lossage if you mv Makefile.new before chmoding it.'
     chmod 444 Makefile.new;
     mv -f Makefile.new Makefile;
     rm -f junk.c junk.cpp;
@@ -1433,4 +1449,3 @@ for file in $MFS; do
 done
 exit 0
 ]
-