(cpp_undefs): Rename from `undefs', update uses.

Use $srcdir rather than $top_srcdir.  Set before calling AC_OUTPUT,
and explicitly export there.  (Bug#507.)

3 files changed, 32 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index cee624fa348..aca4c361b18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-01  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in (cpp_undefs): Rename from `undefs', update uses.
+        Use $srcdir rather than $top_srcdir.  Set before calling AC_OUTPUT,
+        and explicitly export there.  (Bug#507.)
+
 2008-06-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * configure.in:
@@ -7163,6 +7169,7 @@
 ;; Local Variables:
 ;; coding: utf-8
 ;; add-log-time-zone-rule: t
+;; bug-reference-url-format: "http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=%s"
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index cff83b06629..8b3c9164144 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -85,3 +85,15 @@ Bugs must all be in the same state.
   severity 123 critical|grave|serious|important|normal|minor|wishlist
 
 See http://emacsbugs.donarmstrong.com/Developer#severities for the meanings.
+
+** To set the onwer of a bug:
+
+  To: control@emacsbugs.donarmstrong.com
+  owner 123 A Hacker <none@example.com>
+
+The shorthand `!' means your own address.
+
+** To mark a bug as fixed in a particular version:
+
+  To: control@emacsbugs.donarmstrong.com
+  fixed 123 23.0.60
diff --git a/configure.in b/configure.in
index 72982ad80d3..310e5a5158c 100644
--- a/configure.in
+++ b/configure.in
@@ -2848,6 +2848,16 @@ fi
 test "${exec_prefix}" != NONE &&
   exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`]
 
+# Now get this: Some word that is part of the ${srcdir} directory name
+# or the ${configuration} value might, just might, happen to be an
+# identifier like `sun4' or `i386' or something, and be predefined by
+# 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.
+[cpp_undefs="`echo $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'`"]
+
 ## Check if the C preprocessor will convert `..' to `. .'.  If so, set
 ## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile
 ## from Makefile.c can correctly provide the arg `-traditional' to the
@@ -2872,17 +2882,6 @@ done
 # and lib-src/Makefile from ${srcdir}/lib-src/Makefile.c
 # This must be done after src/config.h is built, since we rely on that file.
 
-# Now get this: Some word that is part of the ${srcdir} directory name
-# or the ${configuration} value might, just might, happen to be an
-# identifier like `sun4' or `i386' or something, and be predefined by
-# 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 $canonical |
-sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/  *$//' \
-    -e 's/  */ -U/g' -e 's/-U[0-9][^ ]*//g' \
-`"]
-
 echo creating src/epaths.h
 ${MAKE-make} epaths-force
 
@@ -2901,7 +2900,7 @@ echo creating lib-src/Makefile
   sed -e '1,/start of cpp stuff/d'\
       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
       < Makefile.c > junk.c
-  $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
       sed -e 's/^ /     /' -e '/^#/d' -e '/^[   ]*$/d' > junk2.c
   cat junk1.c junk2.c > Makefile.new
   rm -f junk.c junk1.c junk2.c
@@ -2917,7 +2916,7 @@ echo creating src/Makefile
   sed -e '1,/start of cpp stuff/d'\
       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
       < Makefile.c > junk.c
-  $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
+  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
       sed -e 's/^ /     /' -e '/^#/d' -e '/^[   ]*$/d' > junk2.c
   cat junk1.c junk2.c > Makefile.new
   rm -f junk.c junk1.c junk2.c
@@ -2930,7 +2929,7 @@ if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
   echo source $srcdir/src/.gdbinit > src/.gdbinit
 fi
 
-], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS"])
+], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" cpp_undefs="$cpp_undefs"])
 
 m4_if(dnl       Do not change this comment
    arch-tag: 156a4dd5-bddc-4d18-96ac-f37742cf6a5e