r7344 - dumbhippo/trunk/client/linux

[commits mugshot org]

Author: walters
Date: 2008-02-26 15:33:24 -0600 (Tue, 26 Feb 2008)
New Revision: 7344

Removed:
   dumbhippo/trunk/client/linux/Makefile-libhippocanvas.am
Modified:
   dumbhippo/trunk/client/linux/Makefile-libstacker.am
   dumbhippo/trunk/client/linux/Makefile-mugshot.am
   dumbhippo/trunk/client/linux/Makefile.am
   dumbhippo/trunk/client/linux/configure.ac
Log:
Remove included canvas bits; bump version.


Deleted: dumbhippo/trunk/client/linux/Makefile-libhippocanvas.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-libhippocanvas.am	2008-02-23 18:35:30 UTC (rev 7343)
+++ dumbhippo/trunk/client/linux/Makefile-libhippocanvas.am	2008-02-26 21:33:24 UTC (rev 7344)
@@ -1,15 +0,0 @@
-include $(top_srcdir)/canvas-dist/Makefile-canvas-sources.am
-
-noinst_LTLIBRARIES += libhippocanvas-1.la
-
-libhippocanvas_1_la_CPPFLAGS =		\
-	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
-	$(CANVAS_CFLAGS)		\
-	$(LIBHIPPOCANVAS_CFLAGS)
-
-libhippocanvas_1_la_LIBADD = 		\
-	$(LIBHIPPOCANVAS_LIBS)
-
-libhippocanvas_1_la_SOURCES=$(COMMON_CANVAS_SOURCEFILES) $(LINUX_CANVAS_SOURCEFILES)
-nodist_libhippocanvas_1_la_SOURCES=$(CANVAS_BUILT_SOURCEFILES)

Modified: dumbhippo/trunk/client/linux/Makefile-libstacker.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-libstacker.am	2008-02-23 18:35:30 UTC (rev 7343)
+++ dumbhippo/trunk/client/linux/Makefile-libstacker.am	2008-02-26 21:33:24 UTC (rev 7344)
@@ -3,7 +3,6 @@
 libstacker_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
 	-I $(MARSHAL_DIR)		\
-	$(CANVAS_CFLAGS)		\
 	$(LIBSTACKER_CFLAGS)		\
 	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
 
@@ -124,13 +123,13 @@
 	$(STACKER_MARSHAL_HEADER)		\
 	$(STACKER_MARSHAL_BODY)
 
-MAINTAINERCLEANFILES +=	$(LIBSTACKER_BUILT_SOURCEFILES) $(CANVAS_BUILT_SOURCEFILES) $(CANVAS_ENUMS_STAMPS)
-BUILT_SOURCES += $(LIBSTACKER_BUILT_SOURCEFILES) $(CANVAS_BUILT_SOURCEFILES)
+MAINTAINERCLEANFILES +=	$(LIBSTACKER_BUILT_SOURCEFILES)
+BUILT_SOURCES += $(LIBSTACKER_BUILT_SOURCEFILES)
 
 ## we need to nodist these because otherwise automake would copy 
 ## ../common to distdir/../common which puts common outside of distdir.
 ## so we handle the disting manually so the destination is always distdir/common-dist
-nodist_libstacker_la_SOURCES=$(LIBSTACKER_SOURCEFILES) $(LIBSTACKER_BUILT_SOURCEFILES) $(CANVAS_SRCDIR_FILES) $(CANVAS_BUILT_SOURCEFILES)
+nodist_libstacker_la_SOURCES=$(LIBSTACKER_SOURCEFILES) $(LIBSTACKER_BUILT_SOURCEFILES)
 libstacker-dist-hook:
 	-mkdir $(distdir)/common-dist
 	mkdir $(distdir)/common-dist/stacker

Modified: dumbhippo/trunk/client/linux/Makefile-mugshot.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile-mugshot.am	2008-02-23 18:35:30 UTC (rev 7343)
+++ dumbhippo/trunk/client/linux/Makefile-mugshot.am	2008-02-26 21:33:24 UTC (rev 7344)
@@ -4,11 +4,10 @@
 	$(AM_CPPFLAGS)			\
 	-I $(top_srcdir)		\
 	$(MUGSHOT_CFLAGS)		\
-	$(CANVAS_CFLAGS)		\
 	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
 
 mugshot_LDFLAGS=
-mugshot_LDADD= libhippo.la libstacker.la $(MUGSHOT_LIBS) $(CANVAS_LIBADD)
+mugshot_LDADD= libhippo.la libstacker.la $(MUGSHOT_LIBS)
 
 if !HAVE_GTK210
 mugshot_CPPFLAGS += -I$(top_srcdir)/gtkcopy

Modified: dumbhippo/trunk/client/linux/Makefile.am
===================================================================
--- dumbhippo/trunk/client/linux/Makefile.am	2008-02-23 18:35:30 UTC (rev 7343)
+++ dumbhippo/trunk/client/linux/Makefile.am	2008-02-26 21:33:24 UTC (rev 7344)
@@ -50,21 +50,6 @@
 pkgconfig_DATA =
 TESTS =
 
-CANVASSRCDIR=$(top_srcdir)/canvas-dist
-
-if USE_INCLUDED_CANVAS
-CANVAS_CFLAGS =				\
-	-I $(CANVASSRCDIR)/common	\
-	-I $(CANVASSRCDIR)/linux
-CANVAS_LIBADD= libhippocanvas-1.la
-
-include Makefile-libhippocanvas.am
-else
-# Apparently this doesn't get picked up when automake finds the files to
-# distribute from all branches of the conditional, so add it manually
-EXTRA_DIST += $(CANVASSRCDIR)/common/hippo/hippo-canvas-marshal.list
-endif
-
 include Makefile-libhippoipc.am
 include Makefile-libhippo.am
 include Makefile-libstacker.am

Modified: dumbhippo/trunk/client/linux/configure.ac
===================================================================
--- dumbhippo/trunk/client/linux/configure.ac	2008-02-23 18:35:30 UTC (rev 7343)
+++ dumbhippo/trunk/client/linux/configure.ac	2008-02-26 21:33:24 UTC (rev 7344)
@@ -6,7 +6,7 @@
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(mugshot, 1.1.58)
+AM_INIT_AUTOMAKE(mugshot, 1.1.90)
 
 AM_CONFIG_HEADER(config/config.h)
 
@@ -355,34 +355,6 @@
     fi
 fi
 
-#
-# Check if hippo-canvas is installed or we need to build our included version
-# (canvas be forces with --with-included-canvas/--without-included-canvas
-#
-AC_ARG_WITH(included_canvas,
-	    AC_HELP_STRING([--with-included-canvas=[yes/no/auto]],
-		           [Use copy of HippoCanvas included with the mugshot sources]),
-	    ,
-	    with_included_canvas=auto)
-
-if test "x$with_included_canvas" = xauto ; then
-   AC_MSG_CHECKING([for hippo-canvas library])
-   HIPPO_PKG_CHECK_EXISTS(hippo-canvas-1, with_included_canvas=no, with_included_canvas=yes)
-   if test "x$with_included_canvas" = xyes ; then
-      AC_MSG_RESULT([no: using included version])
-   else
-      AC_MSG_RESULT([yes])
-   fi
-fi
-   
-if test "x$with_included_canvas" = xyes ; then
-   : 
-else
-   CANVAS_MODULES=hippo-canvas-1
-fi
-
-AM_CONDITIONAL(USE_INCLUDED_CANVAS, test "x$with_included_canvas" = xyes)
-
 extra_mugshot_packages=""
 
 if test "x$with_maemo" != xno ; then
@@ -391,10 +363,10 @@
 
 PKG_CHECK_MODULES(LIBHIPPOCANVAS, gtk+-2.0 >= $GTK2_REQUIRED gobject-2.0 >= $GLIB2_REQUIRED cairo pango)
 PKG_CHECK_MODULES(LIBHIPPO, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 ddm-1 >= $DDM_REQUIRED)
-PKG_CHECK_MODULES(LIBSTACKER, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 cairo pango $CANVAS_MODULES ddm-1 >= $DDM_REQUIRED)
+PKG_CHECK_MODULES(LIBSTACKER, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 cairo pango hippo-canvas-1 ddm-1 >= $DDM_REQUIRED)
 PKG_CHECK_MODULES(LIBHIPPOIPC, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
 PKG_CHECK_MODULES(LIBGTKCOPY, gtk+-2.0 >= $GTK2_REQUIRED gtk+-x11-2.0)
-PKG_CHECK_MODULES(MUGSHOT_BASE, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED $XSCREENSAVER_PACKAGES $CANVAS_MODULES  ddm-1 >= $DDM_REQUIRED $extra_mugshot_packages)
+PKG_CHECK_MODULES(MUGSHOT_BASE, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED $XSCREENSAVER_PACKAGES hippo-canvas-1  ddm-1 >= $DDM_REQUIRED $extra_mugshot_packages)
 
 MUGSHOT_LIBS="$MUGSHOT_BASE_LIBS $XSCREENSAVER_LIBS $CURL_LIBS $JPEG_LIBS $RESOLV_LIBS"
 MUGSHOT_CFLAGS="$MUGSHOT_BASE_CFLAGS $XSCREENSAVER_CFLAGS $CURL_CFLAGS"