gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-177-gc05d63f)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  c05d63f61ffc08bb130bca8f14e4c429240938d1 (commit)
      from  aabcb89e83bfbe3f601a023f8c5aa4da725a3c17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gschem/configure.ac.in |   28 +++++-----------------------
 gschem/src/Makefile.am |   11 +----------
 2 files changed, 6 insertions(+), 33 deletions(-)


=================
 Commit Messages
=================

commit c05d63f61ffc08bb130bca8f14e4c429240938d1
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Jan 11 00:36:24 2009 +0000

    gschem: Make requirement for cairo non-conditional.
    
    We can't build without it.

:100644 100644 f345147... 7fbd3d9... M	gschem/configure.ac.in
:100644 100644 87c0c3a... 0403cd7... M	gschem/src/Makefile.am

=========
 Changes
=========

commit c05d63f61ffc08bb130bca8f14e4c429240938d1
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sun Jan 11 00:36:24 2009 +0000

    gschem: Make requirement for cairo non-conditional.
    
    We can't build without it.

diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index f345147..7fbd3d9 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -230,24 +230,13 @@ fi
 # Check for cairo start
 #
 
-AC_ARG_ENABLE(cairo,
-   AC_HELP_STRING([--disable-cairo],
-                  [Disable the use of cairo for rendering]), , enable_cairo=yes)
-
-AM_CONDITIONAL(ENABLE_CAIRO, test "x$enable_cairo" = "xyes")
-
 PKG_CHECK_MODULES(CAIRO, cairo >= 1.2.0, CAIRO="yes", no_CAIRO="yes")
 
-if test "x$enable_cairo" != "xyes"
+if test "$CAIRO" = "yes"
 then
-   AC_DEFINE(ENABLE_CAIRO, 1, [If cairo rendering is enabled, define this])
-
-   if test "$CAIRO" = "yes"
-   then
-      CAIRO_VERSION=`$PKG_CONFIG cairo --modversion`
-   else
-      AC_MSG_ERROR([Cannot find cairo 1.2.0 or later, please install or configure with --disable-cairo])
-   fi
+   CAIRO_VERSION=`$PKG_CONFIG cairo --modversion`
+else
+   AC_MSG_ERROR([Cannot find cairo 1.2.0 or later, please install or configure with --disable-cairo])
 fi
 
 #
@@ -572,18 +561,11 @@ expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
 expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
 expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"`
 
-if test "x$enable_cairo" = "xyes"
-then
-  cairo_report=$CAIRO_VERSION
-else
-  cairo_report="[[DISABLED]]"
-fi
-
 AC_MSG_RESULT([
 ** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION:
 
    GTK+ library version:             $GTK_VERSION
-   CAIRO library version:            $cairo_report
+   CAIRO library version:            $CAIRO_VERSION
    GUILE library version:            $GUILE_VERSION
    libgeda library version:          $LIBGEDA_VERSION
    libstroke library:                $LIBSTROKE
diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am
index 87c0c3a..0403cd7 100644
--- a/gschem/src/Makefile.am
+++ b/gschem/src/Makefile.am
@@ -16,6 +16,7 @@ gschem_SOURCES = \
 	g_register.c \
 	globals.c \
 	gschem.c \
+	gschem_cairo.c \
 	gschem_dialog.c \
 	gschem_toplevel.c \
 	i_basic.c \
@@ -68,16 +69,6 @@ gschem_SOURCES = \
 	x_stroke.c \
 	x_window.c
 
-CAIRO_SRCS = \
-	gschem_cairo.c
-
-EXTRA_gschem_SOURCES = \
-	${CAIRO_SRCS}
-
-if ENABLE_CAIRO
-gschem_SOURCES += ${CAIRO_SRCS}
-endif
-
 if CCISGCC
 AM_CFLAGS = -Wall
 endif




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs