diff options
| author | Glenn Morris | 2011-11-22 00:02:21 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-11-22 00:02:21 -0800 |
| commit | 5f77c86c9f0eec651b73a50adbb6d888449e851a (patch) | |
| tree | 3b1afa1243efd850efc77e7c8527c0a0a90569e4 | |
| parent | 394c65f1c1431645a7ff07afffaac3ce6ac9d55e (diff) | |
| download | emacs-5f77c86c9f0eec651b73a50adbb6d888449e851a.tar.gz emacs-5f77c86c9f0eec651b73a50adbb6d888449e851a.zip | |
Make configure print EMACSDATA/DOC.
* configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
have confusing effects on the build.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 12 insertions, 0 deletions
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-11-22 Glenn Morris <rgm@gnu.org> | 1 | 2011-11-22 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can | ||
| 4 | have confusing effects on the build. (Bug#6401) | ||
| 5 | |||
| 3 | * Makefile.in (install-arch-dep): Tweak previous change. | 6 | * Makefile.in (install-arch-dep): Tweak previous change. |
| 4 | 7 | ||
| 5 | 2011-11-22 Yavor Doganov <yavor@gnu.org> | 8 | 2011-11-22 Yavor Doganov <yavor@gnu.org> |
diff --git a/configure.in b/configure.in index 3ff8962cef4..890b20e7b3f 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -2586,6 +2586,8 @@ if test "${HAVE_NS}" = "yes"; then | |||
| 2586 | AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) | 2586 | AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) |
| 2587 | # See also .m.o rule in Makefile.in */ | 2587 | # See also .m.o rule in Makefile.in */ |
| 2588 | # FIXME: are all these flags really needed? Document here why. */ | 2588 | # FIXME: are all these flags really needed? Document here why. */ |
| 2589 | dnl FIXME this should be renamed to GNUSTEP_CFLAGS, and only | ||
| 2590 | dnl used in src/Makefile.in. | ||
| 2589 | C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" | 2591 | C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" |
| 2590 | ## Extra CFLAGS applied to src/*.m files. | 2592 | ## Extra CFLAGS applied to src/*.m files. |
| 2591 | 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" | 2593 | 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}" | |||
| 3730 | echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" | 3732 | echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" |
| 3731 | echo | 3733 | echo |
| 3732 | 3734 | ||
| 3735 | if test -n "${EMACSDATA}"; then | ||
| 3736 | echo " Environment variable EMACSDATA set to: $EMACSDATA" | ||
| 3737 | fi | ||
| 3738 | if test -n "${EMACSDOC}"; then | ||
| 3739 | echo " Environment variable EMACSDOC set to: $EMACSDOC" | ||
| 3740 | fi | ||
| 3741 | |||
| 3733 | if test $USE_XASSERTS = yes; then | 3742 | if test $USE_XASSERTS = yes; then |
| 3734 | echo " Compiling with asserts turned on." | 3743 | echo " Compiling with asserts turned on." |
| 3735 | CPPFLAGS="$CPPFLAGS -DXASSERTS=1" | 3744 | CPPFLAGS="$CPPFLAGS -DXASSERTS=1" |