[Emacs-diffs] /srv/bzr/emacs/trunk r106474: Make configure print EMACSDATA/DOC.

[Glenn Morris]

------------------------------------------------------------
revno: 106474
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-22 00:02:21 -0800
message:
  Make configure print EMACSDATA/DOC.
  
  * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
  have confusing effects on the build.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-11-22 01:56:49 +0000
+++ b/ChangeLog 2011-11-22 08:02:21 +0000
@@ -1,5 +1,8 @@
 2011-11-22  Glenn Morris  <address@hidden>
 
+       * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
+       have confusing effects on the build.  (Bug#6401)
+
        * Makefile.in (install-arch-dep): Tweak previous change.
 
 2011-11-22  Yavor Doganov  <address@hidden>

=== modified file 'configure.in'
--- a/configure.in      2011-11-22 01:37:45 +0000
+++ b/configure.in      2011-11-22 08:02:21 +0000
@@ -2586,6 +2586,8 @@
     AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing 
under GNUstep.])
     # See also .m.o rule in Makefile.in */
     # FIXME: are all these flags really needed?  Document here why.  */
+    dnl FIXME this should be renamed to GNUSTEP_CFLAGS, and only
+    dnl used in src/Makefile.in.
     C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing 
-I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
     ## Extra CFLAGS applied to src/*.m files.
     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import 
-fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 
-DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
@@ -3730,6 +3732,13 @@
 echo "  Does Emacs use toolkit scroll bars?                     
${USE_TOOLKIT_SCROLL_BARS}"
 echo
 
+if test -n "${EMACSDATA}"; then
+   echo "  Environment variable EMACSDATA set to:                  $EMACSDATA"
+fi
+if test -n "${EMACSDOC}"; then
+   echo "  Environment variable EMACSDOC set to:                   $EMACSDOC"
+fi
+
 if test $USE_XASSERTS = yes; then
    echo "  Compiling with asserts turned on."
    CPPFLAGS="$CPPFLAGS -DXASSERTS=1"