changeset 8771:d3382daaf4d2

Use CARBON_LIBS instead of LIBS for framework Carbon.
author Thomas Treichl <Thomas.Treichl@gmx.net>
date Tue, 17 Feb 2009 00:28:48 -0500
parents af676d09da08
children aeedc045cfe3
files ChangeLog Makeconf.in configure.in src/ChangeLog src/Makefile.in
diffstat 5 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-17  Thomas Treichl  <Thomas.Treichl@gmx.net>
 
+	* Makeconf.in: Substitute CARBON_LIBS.
+	* configure.in: Use CARBON_LIBS instead of LIBS for framework Carbon.
+
 	* configure.in: Fix test for X11 if "--without-x" is given.
 
 2009-02-16  Jaroslav Hajek  <highegg@gmail.com>
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -153,6 +153,8 @@
 X11_INCFLAGS = @X11_INCFLAGS@
 X11_LIBS = @X11_LIBS@
 
+CARBON_LIBS = @CARBON_LIBS@
+
 MAGICK_CONFIG = @MAGICK_CONFIG@
 MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags)
 MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --ldflags --libs)
--- a/configure.in
+++ b/configure.in
@@ -283,8 +283,9 @@
   [have_framework_carbon="yes"], [have_framework_carbon="no"])
 if test $have_framework_carbon = "yes"; then
   AC_DEFINE(HAVE_FRAMEWORK_CARBON, 1, [Define if framework CARBON is available.])
-  LIBS="$LIBS -Wl,-framework -Wl,Carbon"
-  AC_MSG_NOTICE([adding -Wl,-framework -Wl,Carbon to LIBS])
+  CARBON_LIBS="-Wl,-framework -Wl,Carbon"
+  AC_MSG_NOTICE([adding -Wl,-framework -Wl,Carbon to CARBON_LIBS])
+  AC_SUBST(CARBON_LIBS)
 fi
 
 ### On Intel systems with gcc, we may need to compile with -mieee-fp
@@ -2133,6 +2134,7 @@
   FLTK backend libs:    $GRAPHICS_LIBS
   X11 include flags:    $X11_INCFLAGS
   X11 libraries:        $X11_LIBS
+  CARBON libraries:     $CARBON_LIBS
   LIBS:                 $LIBS
   Default pager:        $DEFAULT_PAGER
   gnuplot:              $GNUPLOT
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-17  Thomas Treichl  <Thomas.Treichl@gmx.net>
+
+	* Makefile.in (octave$(EXEEXT)): Link with CARBON_LIBS.
+
 2009-02-16  John W. Eaton  <jwe@octave.org>
 
 	* lex.l (next_token_can_follow_bin_op):
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -374,7 +374,7 @@
 	$(LEXLIB) $(UMFPACK_LIBS) $(AMD_LIBS) $(CAMD_LIBS) $(COLAMD_LIBS) \
 	$(CHOLMOD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \
 	$(FFTW_LIBS) $(QRUPDATE_LIBS) $(ARPACK_LIBS) $(OPENGL_LIBS) \
-	$(X11_LIBS) $(LIBS) $(FLIBS)
+	$(X11_LIBS) $(CARBON_LIBS) $(LIBS) $(FLIBS)
 
 stmp-pic: pic
 	@if [ -f stmp-pic ]; then \