Make configure print EMACSDATA/DOC.

* configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
have confusing effects on the build.

diff --git a/ChangeLog b/ChangeLog
index 4f244c8e34362bd43a3d36b2c201aa5d8efc848a..0232a3f8415683158ce5359f70aa509b699e682b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-22  Glenn Morris  <rgm@gnu.org>
 
+       * 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  <yavor@gnu.org>

diff --git a/configure.in b/configure.in
index 3ff8962cef4d6cbcbb24f80298fc17310fcef381..890b20e7b3fca8b3f23434bc976c15f3225e19ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2586,6 +2586,8 @@ if test "${HAVE_NS}" = "yes"; then
     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 -lxft?                                   ${HAVE_XFT}"
 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"