[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108576: * configure.in: Anticipate platforms with no src/s file.

[Glenn Morris]

------------------------------------------------------------
revno: 108576
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-06-12 13:19:08 -0400
message:
  * configure.in: Anticipate platforms with no src/s file.
  This is based on the previous treatment of src/m files.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-06-12 10:08:39 +0000
+++ b/ChangeLog 2012-06-12 17:19:08 +0000
@@ -1,3 +1,7 @@
+2012-06-12  Glenn Morris  <address@hidden>
+
+       * configure.in: Anticipate platforms with no src/s file.
+
 2012-06-12  Chong Yidong  <address@hidden>
 
        * configure.in: Check for MagickMergeImageLayers (Bug#11678).

=== modified file 'configure.in'
--- a/configure.in      2012-06-12 16:14:53 +0000
+++ b/configure.in      2012-06-12 17:19:08 +0000
@@ -3162,7 +3162,11 @@
 AC_SUBST(CFLAGS)
 ## Used in lwlib/Makefile.in.
 AC_SUBST(X_TOOLKIT_TYPE)
-S_FILE="\$(srcdir)/${opsysfile}"
+if test -n "${opsysfile}"; then
+  S_FILE="\$(srcdir)/${opsysfile}"
+else
+  S_FILE=
+fi
 AC_SUBST(S_FILE)
 AC_SUBST(ns_appdir)
 AC_SUBST(ns_appbindir)
@@ -3175,8 +3179,10 @@
                   [Define to the canonical Emacs configuration name.])
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}",
                   [Define to the options passed to configure.])
-AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}",
-                  [Define to the used os dependent file.])
+if test -n "$opsysfile"; then
+  AC_DEFINE_UNQUOTED(config_opsysfile, "${opsysfile}",
+                    [Define to the used os dependent file.])
+fi
 
 XMENU_OBJ=
 XOBJ=
@@ -3519,7 +3525,9 @@
 #define subprocesses
 
 /* Include the os dependent file.  */
-#include config_opsysfile
+#ifdef config_opsysfile
+# include config_opsysfile
+#endif
 
 /* GNUstep needs a bit more pure memory.  Of the existing knobs,
    SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.
@@ -3614,8 +3622,7 @@
 Configured for \`${canonical}'.
 
   Where should the build process find the source code?    ${srcdir}
-  What operating system file should Emacs use?
-        \`${opsysfile}'
+  What operating system file should Emacs use?           \`${opsysfile-none}'
   What compiler should emacs be built with?               ${CC} ${CFLAGS}
   Should Emacs use the GNU version of malloc?             
${GNU_MALLOC}${GNU_MALLOC_reason}
   Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}