diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-16 10:58:27 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-16 10:58:27 -0700 |
| commit | 8877ca0fdc090b6506a95272c0e6f1e16c3b0571 (patch) | |
| tree | b8e3f61337d275e60c228a35b3855f30cf3bc43f /configure | |
| parent | 5fdb74689d393b76a7a5edff57205ff27fcd7bc1 (diff) | |
| download | emacs-8877ca0fdc090b6506a95272c0e6f1e16c3b0571.tar.gz | |
Simplify temacs build rule.
* configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
(START_FILES): Set to empty if NS_IMPL_GNUSTEP.
(GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
nothing uses.
* configure: Regenerate.
* src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
(LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
(temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
Make most of the NS_IMPL_GNUSTEP case the same as the default case.
* msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure b/configure index 5f97e64a014..eef5502c8ef 100755 --- a/configure +++ b/configure @@ -718,6 +718,7 @@ XMKMF LD_SWITCH_X_SITE_AUX LD_SWITCH_X_SITE_AUX_RPATH NS_IMPL_GNUSTEP_INC +NS_IMPL_GNUSTEP_TEMACS_LDFLAGS NS_OBJ NS_SUPPORT LIB_STANDARD @@ -795,8 +796,6 @@ ns_appdir ns_appbindir ns_appresdir ns_appsrc -GNUSTEP_SYSTEM_HEADERS -GNUSTEP_SYSTEM_LIBRARIES GNU_OBJC_CFLAGS OTHER_FILES FONT_OBJ @@ -9933,6 +9932,7 @@ 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" @@ -9960,11 +9960,13 @@ 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}" LIB_STANDARD= + START_FILES= fi if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5 @@ -10153,6 +10155,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + NS_OBJ= NS_SUPPORT= if test "${HAVE_NS}" = yes; then @@ -21594,7 +21597,7 @@ HAVE_LIBNCURSES=yes ## Use terminfo instead of termcap? ## Note only system files NOT using terminfo are: -## bsd-common, freebsd < 40000, ms-w32, msdos, netbsd, and +## freebsd < 40000, ms-w32, msdos, netbsd, and ## darwin|gnu without ncurses. TERMINFO=no LIBS_TERMCAP= @@ -26359,8 +26362,6 @@ fi - - cat >>confdefs.h <<_ACEOF #define EMACS_CONFIGURATION "${canonical}" _ACEOF |