[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111095: Properly configure GNUstep libraries

[Andreas Schwab]

------------------------------------------------------------
revno: 111095
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2012-12-29 20:37:32 +0100
message:
  Properly configure GNUstep libraries
  
  * configure.ac (TEMACS_LDFLAGS2): Don't define.
  (LIBS_GNUSTEP): Set for GNUstep and substitute.
  (LD_SWITCH_SYSTEM_TEMACS): Don't set for GNUstep.
  
  * src/Makefile.in (TEMACS_LDFLAGS2): Remove.
  (LIBS_GNUSTEP): Define.
  (LIBES): Add $(LIBS_GNUSTEP).
  (temacs$(EXEEXT)): Use $(LDFLAGS) instead of $(TEMACS_LDFLAGS2).
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-12-24 10:26:35 +0000
+++ b/ChangeLog 2012-12-29 19:37:32 +0000
@@ -1,3 +1,9 @@
+2012-12-29  Andreas Schwab  <address@hidden>
+
+       * configure.ac (TEMACS_LDFLAGS2): Don't define.
+       (LIBS_GNUSTEP): Set for GNUstep and substitute.
+       (LD_SWITCH_SYSTEM_TEMACS): Don't set for GNUstep.
+
 2012-12-24  Andreas Schwab  <address@hidden>
 
        * configure.ac (SIGNALS_VIA_CHARACTERS): Also define for darwin.

=== modified file 'configure.ac'
--- a/configure.ac      2012-12-24 10:26:35 +0000
+++ b/configure.ac      2012-12-29 19:37:32 +0000
@@ -1460,8 +1460,8 @@
 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
@@ -1488,9 +1488,9 @@
      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=
      dnl GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS to 0 or 1.
      dnl If they had chosen to either define it or not, we could have
      dnl just used AC_CHECK_DECL here.
@@ -1541,7 +1541,7 @@
   fi
 fi
 
-AC_SUBST(TEMACS_LDFLAGS2)
+AC_SUBST(LIBS_GNUSTEP)
 
 INSTALL_ARCH_INDEP_EXTRA=install-etc
 ns_self_contained=no
@@ -4356,10 +4356,6 @@
   *) 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
-
 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
 
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-27 17:29:14 +0000
+++ b/src/ChangeLog     2012-12-29 19:37:32 +0000
@@ -1,3 +1,10 @@
+2012-12-29  Andreas Schwab  <address@hidden>
+
+       * src/Makefile.in (TEMACS_LDFLAGS2): Remove.
+       (LIBS_GNUSTEP): Define.
+       (LIBES): Add $(LIBS_GNUSTEP).
+       (temacs$(EXEEXT)): Use $(LDFLAGS) instead of $(TEMACS_LDFLAGS2).
+
 2012-12-27  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (set_cursor_from_row): Don't confuse a truncation or

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-12-10 17:55:03 +0000
+++ b/src/Makefile.in   2012-12-29 19:37:32 +0000
@@ -109,9 +109,6 @@
 ## Flags to pass to ld only for temacs.
 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
 
-## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason).
-TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
-
 ## If available, the full path to the paxctl program.
 ## On grsecurity/PaX systems, unexec will fail due to a gap between
 ## the bss section and the heap.  This can be prevented by disabling
@@ -227,6 +224,9 @@
 ## configure, which should set it to nil in non-X builds.
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 
+## Only used for GNUstep
address@hidden@
+
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
 
@@ -389,7 +389,7 @@
 ## Note that SunOS needs -lm to come before -lc; otherwise, you get
 ## duplicated symbols.  If the standard libraries were compiled
 ## with GCC, we might need LIB_GCC again after them.
-LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
+LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
    $(LIB_TIMER_TIME) $(DBUS_LIBS) \
@@ -463,7 +463,7 @@
        cd $(lib) && $(MAKE) libgnu.a
 
 temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) 
$(lib)/libgnu.a
-       $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) 
$(TEMACS_LDFLAGS2) \
+       $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
          -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES)
        test "$(CANNOT_DUMP)" = "yes" || \
          test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)