diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-25 20:50:16 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-25 20:50:16 -0700 |
| commit | cd54a59940a61c8c706a632d1cb3e4a6ec21f5f7 (patch) | |
| tree | 1ddd52df4d95c823a92ff4a6f4607eb3dbdebc43 /configure.in | |
| parent | ccd89fb3d6475cae1df64a64f87977c21e98389b (diff) | |
| download | emacs-cd54a59940a61c8c706a632d1cb3e4a6ec21f5f7.tar.gz | |
Add GNUSTEP_LOCAL_HEADERS/LIBRARIES to build flags.
* configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS):
Add $GNUSTEP_LOCAL_HEADERS.
(LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 677080603da..d943dafdcd4 100644 --- a/configure.in +++ b/configure.in @@ -1492,10 +1492,17 @@ if test "${with_ns}" != no; then dnl FIXME sourcing this several times in subshells seems inefficient. GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" - CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" - LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" + dnl I seemed to need these as well with GNUstep-startup 0.25. + GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)" + GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)" + test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \ + GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}" + test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \ + GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}" + CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" + LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}" LIB_STANDARD= START_FILES= TEMACS_LDFLAGS2= @@ -3298,7 +3305,7 @@ case "$opsys" in esac if test "$NS_IMPL_GNUSTEP=yes"; then - LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} -L${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" + LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" fi AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) |