aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-09-14 20:01:25 -0700
committerGlenn Morris2011-09-14 20:01:25 -0700
commit088f329c332c6dc6a83336a6817ed9014bfbfb33 (patch)
treeeab352403cb4c5d135dc231004f468008c7143f8
parent0cc87afbdb5cd4b1a368c498d7544d82ca9fb750 (diff)
downloademacs-088f329c332c6dc6a83336a6817ed9014bfbfb33.tar.gz
emacs-088f329c332c6dc6a83336a6817ed9014bfbfb33.zip
* configure.in: (C_SWITCH_X_SYSTEM): Enable GNUstep to find its headers.
-rw-r--r--ChangeLog1
-rw-r--r--configure.in2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 880b8c35167..abaa7c6eb88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
3 * configure.in: Make configure work with recent GNUsteps. 3 * configure.in: Make configure work with recent GNUsteps.
4 (_NATIVE_OBJC_EXCEPTIONS): New AC_DEFINE. 4 (_NATIVE_OBJC_EXCEPTIONS): New AC_DEFINE.
5 (GNU_OBJC_CFLAGS): Add -fobjc-exceptions when needed. 5 (GNU_OBJC_CFLAGS): Add -fobjc-exceptions when needed.
6 (C_SWITCH_X_SYSTEM): Enable GNUstep to find its headers.
6 7
72011-09-11 Paul Eggert <eggert@cs.ucla.edu> 82011-09-11 Paul Eggert <eggert@cs.ucla.edu>
8 9
diff --git a/configure.in b/configure.in
index cfc04137470..63b80e40466 100644
--- a/configure.in
+++ b/configure.in
@@ -2582,7 +2582,7 @@ if test "${HAVE_NS}" = "yes"; then
2582 AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.]) 2582 AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
2583 # See also .m.o rule in Makefile.in */ 2583 # See also .m.o rule in Makefile.in */
2584 # FIXME: are all these flags really needed? Document here why. */ 2584 # FIXME: are all these flags really needed? Document here why. */
2585 C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing" 2585 C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
2586 ## Extra CFLAGS applied to src/*.m files. 2586 ## Extra CFLAGS applied to src/*.m files.
2587 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" 2587 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"
2588 fi 2588 fi