From: Steven Tamm <steventamm@mac.com>
Date: Thu, 2 Sep 2004 17:02:11 +0000 (+0000)
Subject: (LIBS_CARBON): New define to specify libraries for
X-Git-Tag: ttn-vms-21-2-B4~5095
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=640a07706b1bdd45a0cbaadd49b72d2c5d79377b;p=emacs.git

(LIBS_CARBON): New define to specify libraries for
Carbon support.
(LD_SWITCH_SYSTEM_TEMACS): Don't link with unused libstdc++.  Use
LIBS_CARBON.
---

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 814de2c2c51..f854ed9380b 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -243,11 +243,18 @@ Boston, MA 02111-1307, USA.  */
    specific headers.  */
 #define C_SWITCH_SYSTEM -fpascal-strings -fno-common -DMAC_OSX -I../mac/src
 
-/* Link in the Carbon lib.  The -headerpad option tells ld (see man
-   page) to leave room at the end of the header for adding load
-   commands.  Needed for dumping.  0x690 is the total size of 30
-   segment load commands (at 56 each).  */
-#define LD_SWITCH_SYSTEM_TEMACS -prebind -framework Carbon -framework QuickTime -lstdc++ -Xlinker -headerpad -Xlinker 690
+/* Link in the Carbon lib. */
+#ifdef HAVE_CARBON
+#define LIBS_CARBON -framework Carbon -framework QuickTime
+#else
+#define LIBS_CARBON -framework Carbon
+#endif
+
+/* The -headerpad option tells ld (see man page) to leave room at the
+   end of the header for adding load commands.  Needed for dumping.
+   0x690 is the total size of 30 segment load commands (at 56
+   each).  */
+#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_CARBON -Xlinker -headerpad -Xlinker 690
 
 #define C_SWITCH_SYSTEM_TEMACS -Dtemacs