[changeset] Missing ScreenSize & ScreenPixelsPerInch properties

[Thomas Treichl]

Thomas Treichl schrieb:
> > | > | (b) Turn off empty output of configuration summary if Carbon is 
> > used, eg.
> > | > | | > |    X11 include flags:
> > | > |    X11 libraries:
> > | > | | > | and turn on output about Carbon framework instead, eg.
> > | > | | > |    Carbon libraries: -Wl,-framework -Wl,Carbon
> > | > | > I don't think this part is really necessary, so I'd say omit it.
> > | | Yes ok.
> >
> > I meant the part about removing the empty X11 include and library
> > flags.  It would be OK to put the Carbon libraries in the summary if
> > they are stored in a separate variable.  But I see that you are
> > currently adding them to LIBS, so in that case I don't think a
> > separate line is needed.
>
> I may come back to this idea somewhen the next days, is $(CARBON_LIBS) 
> okay?

I attached a changeset that uses $(CARBON_LIBS) instead of just $(LIBS). Should 
this also find its place in mkoctfile.in and octave-config.in? I was looking for 
$(X11_LIBS) in these files but couldn't find any, my implementation leans on X11 
ie. I can more easily find out where it should be added. I'll also send a 
changeset for the documentation when I've finished the framework OpenGL test, too.

Did you already have a chance to take a look at my second trial X11 test from my 
previous email of this thread?

Best regards,

  Thomas

# HG changeset patch
# User Thomas Treichl <address@hidden>
# Date 1233868769 -3600
# Node ID dbcb4e41805bd8c0aac81d12d5c51cec30ffeba7
# Parent  6f5b2835325cd17552ea2f5f085c066f1518a45f
Use CARBON_LIBS instead of LIBS for framework Carbon.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-04  Thomas Treichl  <address@hidden>
+
+       * Makeconf.in: Substitute CARBON_LIBS.
+       * configure.in: Use CARBON_LIBS instead of LIBS for framework Carbon.
+
 2009-02-03  Jaroslav Hajek  <address@hidden>
 
        * aclocal.m4 (AC_CHECK_QHULL_OK): New macro, based on suggestion by
diff --git a/Makeconf.in b/Makeconf.in
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -152,6 +152,8 @@
 
 X11_INCFLAGS = @X11_INCFLAGS@
 X11_LIBS = @X11_LIBS@
+
+CARBON_LIBS = @CARBON_LIBS@
 
 MAGICK_CONFIG = @MAGICK_CONFIG@
 MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags)
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -275,8 +275,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
@@ -2119,6 +2120,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
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-21  John W. Eaton  <address@hidden>
+
+       * Makefile.in (octave$(EXEEXT)): Link with CARBON_LIBS.
+
 2009-02-04  John W. Eaton  <address@hidden>
 
        * pt-loop.h, pt-loop.cc (evaluating_looping_command):
diff --git a/src/Makefile.in b/src/Makefile.in
--- 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 \