[Gpredict-svn] SF.net SVN: gpredict:[175] trunk

[<cs...@us...>]

Revision: 175
          http://gpredict.svn.sourceforge.net/gpredict/?rev=175&view=rev
Author:   csete
Date:     2008-12-27 19:54:20 +0000 (Sat, 27 Dec 2008)

Log Message:
-----------
Use sytem wide GooCanvas library instead of built-in copy. Build now requires GooCanvas 0.10 to be installed.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/autogen.sh
    trunk/configure.ac
    trunk/src/Makefile.am

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/Makefile.am	2008-12-27 19:54:20 UTC (rev 175)
@@ -1,4 +1,4 @@
-SUBDIRS = goocanv8 src doc pixmaps data po
+SUBDIRS = src doc pixmaps data po
 
 install-data-local:
 	@$(NORMAL_INSTALL)

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/autogen.sh	2008-12-27 19:54:20 UTC (rev 175)
@@ -37,12 +37,6 @@
 # This might not be necessary with newer autotools:
 rm -f config.cache
 
-echo "****** autogen GooCanvas"      && \
-  cd goocanv8    && \
-  ./autogen.sh     && \
-  cd ..          && \
-echo "****** finished GooCanvas"      && \
-
 # We use glib-gettextize, which apparently does not add the intl directory 
 # (containing a local copy of libintl code), and therefore has a slightly different Makefile.
 echo "- glib-gettextize."	&& \

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/configure.ac	2008-12-27 19:54:20 UTC (rev 175)
@@ -20,8 +20,8 @@
   CFLAGS="${CFLAGS} -Wall"
 fi
 
-dnl chack for glib and gtk libraries
-pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0"
+dnl check for glib, gtk, and goocanvas libraries
+pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.10"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
@@ -31,10 +31,10 @@
 PKG_CHECK_MODULES(LIBCURL, libcurl, [
         CFLAGS="$CFLAGS $LIBCURL_CFLAGS";
         LIBS="$LIBS $LIBCURL_LIBS"; 
-        havecurl=true;            
+        havecurl=true;
         AC_DEFINE(HAVE_LIBCURL, 1, [Define if libcurl is available])
    ], [
-        havecurl=false;            
+        havecurl=false;
         AC_DEFINE(HAVE_LIBCURL, 0, [Define if libcurl is unvailable])
 
 ])
@@ -76,6 +76,7 @@
 GTHR_V=`pkg-config --modversion gthread-2.0`
 GDK_V=`pkg-config --modversion gdk-2.0`
 GTK_V=`pkg-config --modversion gtk+-2.0`
+GOOC_V=`pkg-config --modversion goocanvas`
 dnl SQL_V=`pkg-config --modversion sqlite3`
 if test "$havecurl" = true ; then
    CURL_V=`pkg-config --modversion libcurl`
@@ -88,7 +89,6 @@
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
-AC_CONFIG_SUBDIRS(goocanv8)
 
 AC_OUTPUT([
 Makefile
@@ -113,6 +113,7 @@
 echo Gthread version.... : $GTHR_V
 echo Gdk version........ : $GDK_V
 echo Gtk+ version....... : $GTK_V
+echo GooCanvas version.. : $GOOC_V
 dnl echo SQLite version..... : $SQL_V
 if test "$havecurl" = true ; then
 echo Curl version....... : $CURL_V

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/src/Makefile.am	2008-12-27 19:54:20 UTC (rev 175)
@@ -3,7 +3,7 @@
 SUBDIRS = sgpsdp
 
 INCLUDES = \
-	@PACKAGE_CFLAGS@ -I.. -I$(top_srcdir)/goocanv8/src \
+	@PACKAGE_CFLAGS@ -I.. \
 	-DDATADIR=\""$(datadir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)/gpredict"\" \
 	-DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/gpredict"\" \
@@ -113,7 +113,7 @@
 
 
 ##gpredict_LDADD = ./sgpsdp/libsgp4sdp4.a @PACKAGE_LIBS@
-gpredict_LDADD = @PACKAGE_LIBS@ ../goocanv8/src/.libs/libgoocanvas.a
+gpredict_LDADD = @PACKAGE_LIBS@
 
 ## $(INTLLIBS)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.