diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-12-30 07:18:53 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-12-30 07:18:53 -0500 |
| commit | beb0fe40b661ef783e21e816f307d6a6b123ebfe (patch) | |
| tree | 4b450a18c8885de162ec6a3e0a4b2ddf08831e3a /autogen | |
| parent | e4f8453ad1605ce9bdb6d87ff7a1ef707a577d30 (diff) | |
| download | emacs-beb0fe40b661ef783e21e816f307d6a6b123ebfe.tar.gz | |
Auto-commit of generated files.
Diffstat (limited to 'autogen')
| -rw-r--r-- | autogen/Makefile.in | 2 | ||||
| -rwxr-xr-x | autogen/configure | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in index db60a006a21..98c8ab08855 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -546,6 +546,7 @@ LIBRESOLV = @LIBRESOLV@ LIBS = @LIBS@ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ LIBSOUND = @LIBSOUND@ +LIBS_GNUSTEP = @LIBS_GNUSTEP@ LIBS_MAIL = @LIBS_MAIL@ LIBS_SYSTEM = @LIBS_SYSTEM@ LIBS_TERMCAP = @LIBS_TERMCAP@ @@ -742,7 +743,6 @@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ TERMCAP_OBJ = @TERMCAP_OBJ@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ TOOLKIT_LIBW = @TOOLKIT_LIBW@ diff --git a/autogen/configure b/autogen/configure index 6c7ef6bf42b..c8cc6d262e2 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1211,7 +1211,7 @@ NS_OBJC_OBJ NS_OBJ ns_self_contained INSTALL_ARCH_INDEP_EXTRA -TEMACS_LDFLAGS2 +LIBS_GNUSTEP LD_SWITCH_X_SITE_RPATH XMKMF DEPFLAGS @@ -9450,8 +9450,8 @@ tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" -TEMACS_LDFLAGS2="\${LDFLAGS}" GNU_OBJC_CFLAGS= +LIBS_GNUSTEP= if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes @@ -9476,9 +9476,9 @@ if test "${with_ns}" != no; then CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}" + LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread" LIB_STANDARD= START_FILES= - TEMACS_LDFLAGS2= { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS" >&5 $as_echo_n "checking if GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS... " >&6; } if test "${emacs_cv_objc_exceptions+set}" = set; then : @@ -24624,10 +24624,6 @@ case "$opsys" in *) 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 - |