From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Emacs with GNUstep Date: Sat, 29 Dec 2012 09:22:01 +0100 Message-ID: References: <1356742813.1641.3.camel@german-desktop> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1356769343 2561 80.91.229.3 (29 Dec 2012 08:22:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Dec 2012 08:22:23 +0000 (UTC) Cc: Emacs-devel To: =?utf-8?Q?Germ=C3=A1n?= "A. Arias" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 29 09:22:39 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Torgj-0007zD-JQ for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2012 09:22:37 +0100 Original-Received: from localhost ([::1]:49992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TorgU-00081t-Ou for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2012 03:22:22 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:56029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TorgO-00080Z-Je for emacs-devel@gnu.org; Sat, 29 Dec 2012 03:22:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TorgK-0008BG-TX for emacs-devel@gnu.org; Sat, 29 Dec 2012 03:22:16 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:34386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TorgK-0008An-Jv for emacs-devel@gnu.org; Sat, 29 Dec 2012 03:22:12 -0500 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3YYHnv5jwqz3hhbV; Sat, 29 Dec 2012 09:22:10 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3YYHnt0qcnzbbhx; Sat, 29 Dec 2012 09:22:10 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id eRf1SaFb6JOC; Sat, 29 Dec 2012 09:22:01 +0100 (CET) X-Auth-Info: u/CJMKDVYNBCKmOrAHEPxN8zj7YwTZQq7/tWNoFSWFM= Original-Received: from linux.local (ppp-88-217-123-62.dynamic.mnet-online.de [88.217.123.62]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 29 Dec 2012 09:22:02 +0100 (CET) Original-Received: by linux.local (Postfix, from userid 501) id 4903614E0F0; Sat, 29 Dec 2012 09:22:02 +0100 (CET) X-Yow: Did you GAIN WEIGHT in th' past 5 MINUTES or am I just DREAMING of two BROCCOLI FLORETS lying in an empty GAS TANK? In-Reply-To: <1356742813.1641.3.camel@german-desktop> (=?utf-8?Q?=22Germ?= =?utf-8?Q?=C3=A1n?= \"A. Arias\""'s message of "Fri, 28 Dec 2012 19:00:13 -0600") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:155982 Archived-At: This should fix it. Andreas. diff --git a/configure.ac b/configure.ac index 429443c..2f1124d 100644 --- a/configure.ac +++ b/configure.ac @@ -1475,8 +1475,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 @@ -1503,9 +1503,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= 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. @@ -1556,7 +1556,7 @@ fail; fi fi -AC_SUBST(TEMACS_LDFLAGS2) +AC_SUBST(LIBS_GNUSTEP) INSTALL_ARCH_INDEP_EXTRA=install-etc ns_self_contained=no @@ -4287,10 +4287,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 - AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) diff --git a/src/Makefile.in b/src/Makefile.in index 0e91eae..96b1d6d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -111,9 +111,6 @@ LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ ## 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 @@ -230,6 +227,9 @@ LIBX_OTHER=@LIBX_OTHER@ ## configure, which should set it to nil in non-X builds. LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) +## Only used for GNUstep +LIBS_GNUSTEP=@LIBS_GNUSTEP@ + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -400,7 +400,7 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ ## 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_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ @@ -475,7 +475,7 @@ $(lib)/libgnu.a: $(config_h) temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) \ $(lib)/libgnu.a $(W32_RES) - $(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) \ $(W32_RES_LINK) test "$(CANNOT_DUMP)" = "yes" || \ -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."