X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0ca2af7c0b4c9edfaaed391d9bf34cb7ed148a1b..28d3ed91adb431470f8ee9b84941779709df9b8b:/configure1.in

diff --git a/configure1.in b/configure1.in
index a75861e593..d5a226bdfa 100755
--- a/configure1.in
+++ b/configure1.in
@@ -102,7 +102,7 @@ The --run-in-place option sets up default values for the path
 
 The --srcdir=DIR option specifies that the configuration and build
 	processes should look for the Emacs source code in DIR, when
-	DIR is not the current directory.  This option doesn't work yet.
+	DIR is not the current directory.
 
 If successful, ${progname} leaves its status in config.status.  If
 unsuccessful after disturbing the status quo, it removes config.status."
@@ -196,8 +196,6 @@ Set it to either \`yes' or \`no'."
 	    shift; val="$1"
 	  fi
           srcdir="${val}"
-
-	  echo "${progname}: Beware - the \`--srcdir' option doesn't work yet." >&2
 	;;
 
 	## Has the user tried to tell us where the X files are?
@@ -320,7 +318,9 @@ fi
 if [ ! -d ./oldXMenu ]; then
   mkdir ./oldXMenu
 fi
-
+if [ ! -d ./etc ]; then
+  mkdir ./etc
+fi
 
 #### Given the configuration name, set machfile and opsysfile to the
 #### names of the m/*.h and s/*.h files we should use.
@@ -678,7 +678,7 @@ case "${configuration}" in
   ;;
 
   ## Suns
-  *-sun-sunos* | *-sun-bsd* )
+  *-sun-sunos* | *-sun-bsd* | *-sun-solaris* )
     case "${configuration}" in
       m68*-sunos1* )	machine=sun1 ;;
       m68*-sunos2* )	machine=sun2 ;;
@@ -690,6 +690,7 @@ case "${configuration}" in
     case "${configuration}" in
       *-sunos4.0*	  ) opsys=sunos4-0 ;;
       *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
+      *-sunos5* | *-solaris* ) opsys=sol2 ;;
       *			  ) opsys=bsd4-2   ;;
     esac
   ;;
@@ -814,16 +815,37 @@ if test -n "${GCC}"; then
   CFLAGS='-g -O'
 fi
 
-#### Some other nice autoconf tests.
+#### Some other nice autoconf tests.  If you add a test here which
+#### should make an entry in src/config.h, don't forget to add an
+#### #undef clause to src/config.h.in for autoconf to modify.
 ]
+dnl checks for programs
 AC_LN_S
 AC_PROG_CPP
+
+dnl checks for UNIX variants that set `DEFS'
+
+dnl checks for header files
 AC_HAVE_HEADERS(sys/timeb.h sys/time.h)
+AC_STDC_HEADERS
+AC_TIME_WITH_SYS_TIME
+
+dnl checks for typedefs
 AC_RETSIGTYPE
+
+dnl checks for functions
 AC_ALLOCA
 AC_HAVE_FUNCS(gettimeofday gethostname dup2)
+
+dnl checks for structure members
 AC_STRUCT_TM
+
+dnl checks for compiler characteristics
 AC_CONST
+
+dnl checks for operating system services
+
+dnl other checks for UNIX variants
 [
 
 
@@ -998,11 +1020,10 @@ dnl   so (as far as I can tell) there's no way to compute the value
 dnl   the CPP macro should receive.  We cripple that quoting for a
 dnl   bit, invoke AC_DEFINE, and then uncripple it.
 
-define([hold_ac_define_sedquote], defn([AC_DEFINE_SEDQUOTE]))
-define([AC_DEFINE_SEDQUOTE],[$1])
+pushdef([AC_DEFINE_SEDQUOTE],[$1])
 AC_DEFINE(config_machfile,  "\"${machfile}\"")
 AC_DEFINE(config_opsysfile, "\"${opsysfile}\"")
-define([AC_DEFINE_SEDQUOTE],hold_ac_define_sedquote)
+popdef([AC_DEFINE_SEDQUOTE])
 
 AC_DEFINE(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
 AC_DEFINE(C_SWITCH_X_SITE,  ${C_SWITCH_X_SITE})