Mercurial > emacs
changeset 108789:b77dfb08cff8
Regenerate configure.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 25 May 2010 20:53:25 -0700 |
| parents | 17428e70b5d9 |
| children | 1b3be6d705bd |
| files | configure |
| diffstat | 1 files changed, 16 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue May 25 20:50:16 2010 -0700 +++ b/configure Tue May 25 20:53:25 2010 -0700 @@ -720,8 +720,6 @@ XMKMF LD_SWITCH_X_SITE_AUX LD_SWITCH_X_SITE_AUX_RPATH -NS_IMPL_GNUSTEP_INC -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS TEMACS_LDFLAGS2 NS_OBJ NS_SUPPORT @@ -9935,8 +9933,6 @@ HAVE_NS=no NS_IMPL_COCOA=no NS_IMPL_GNUSTEP=no -NS_IMPL_GNUSTEP_INC= -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" @@ -9955,22 +9951,18 @@ ns_appbindir=${ns_appdir} ns_appresdir=${ns_appdir}Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" - GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" + GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" - ## Pull in stuff from GNUstep-make. - ## FIXME? Cleaner to use AC_SUBST_FILE for this? - NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu -GUI_LIB=gnu -include $GNUSTEP_MAKEFILES/Additional/base.make -include $GNUSTEP_MAKEFILES/Additional/gui.make -shared=no -" - NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" - 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}" + 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= @@ -10162,8 +10154,6 @@ fi - - ns_frag=/dev/null NS_OBJ= NS_SUPPORT= @@ -26634,6 +26624,11 @@ *) LD_SWITCH_SYSTEM_TEMACS= ;; esac +if test "$NS_IMPL_GNUSTEP=yes"; then + LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" +fi + + LINKER=