gtk-css-engine r162 - in trunk: . libccss src

[robsta svn gnome org]

Author: robsta
Date: Mon Oct  6 14:34:59 2008
New Revision: 162
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=162&view=rev

Log:
Split out libccss.

Removed:
   trunk/libccss/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Oct  6 14:34:59 2008
@@ -2,7 +2,7 @@
 ACLOCAL_AMFLAGS = -I .
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-werror --enable-libccss
 
-SUBDIRS = doc libccss src themes
+SUBDIRS = doc src themes
 
 EXTRA_DIST = \
 	AUTHORS \

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Oct  6 14:34:59 2008
@@ -6,40 +6,23 @@
 # Guessing some version.
 AC_PREREQ(2.54)
 
-m4_define([ccss_version_major], [0])
-m4_define([ccss_version_minor], [3])
-m4_define([ccss_version_micro], [0])
+m4_define([gce_version_major], [0])
+m4_define([gce_version_minor], [3])
+m4_define([gce_version_micro], [0])
 ### For the release:
-# m4_define([ccss_version_extra], [])
+# m4_define([gce_version_extra], [])
 ### On trunk:
-m4_define([ccss_version_extra], [.trunk])
-m4_define([ccss_version],
-    [ccss_version_major.ccss_version_minor.ccss_version_micro[]ccss_version_extra])
+m4_define([gce_version_extra], [.trunk])
+m4_define([gce_version],
+    [gce_version_major.gce_version_minor.gce_version_micro[]gce_version_extra])
 
-AC_INIT([gtk-css-engine], [ccss_version])
+AC_INIT([gtk-css-engine], [gce_version])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_HEADERS([libccss/ccss/ccss-features.h])
-AC_CONFIG_SRCDIR([libccss/ccss/ccss-stylesheet.c])
+AC_CONFIG_SRCDIR([src/gce-style.c])
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
-dnl Version info for libraries = CURRENT:REVISION:AGE
-dnl
-dnl Within each x.y.*, ABI is maintained backward and _forward_ compatible.
-dnl (As a consequence, no exported function may be added.)
-dnl So it's enough to have one interface number per each x.y.* branch.
-dnl
-dnl OTOH, we are not able to keep ABI strictly backward compatible throughout
-dnl the whole x.*.*.
-dnl The easiest way is to declare no ABI compatibility, ie. AGE is always 0.
-dnl
-m4_define([version_iface],
-	m4_eval(100 * ccss_version_major + ccss_version_minor))
-
-AC_SUBST([VERSION_INFO], [version_iface:ccss_version_micro:0])
-
-
 ### Checks for configure arguments. ############################################
 
 AC_ARG_ENABLE([rapid-development], 
@@ -59,24 +42,6 @@
 fi
 
 
-AC_ARG_ENABLE([libccss], 
-  [AS_HELP_STRING([--enable-libccss], [build standalone libccss])], 
-[
-  case "$enableval" in
-  yes ) ;;
-  no  ) ;;
-  * ) enable_libccss="yes" ;;
-  esac
-], [
-  enable_libccss="no"
-])
-
-if test "$enable_libccss" == "yes"; then
-  AC_DEFINE([CCSS_STANDALONE], [1], [build standalone libccss])
-fi
-AM_CONDITIONAL([CCSS_STANDALONE], test "$enable_libccss" == "yes")
-
-
 AC_ARG_ENABLE([debug], 
   [AS_HELP_STRING([--enable-debug], [enable debug code])], 
 [
@@ -86,10 +51,10 @@
 ])
 
 if test "$enable_debug" == "yes"; then
-  AC_DEFINE([CCSS_DEBUG], [1], [enable debug code])
+  AC_DEFINE([GCE_DEBUG], [1], [enable debug code])
   CFLAGS="-g -O0 ${CFLAGS}"
 fi
-AM_CONDITIONAL([CCSS_DEBUG], test "$enable_debug" == "yes")
+AM_CONDITIONAL([GCE_DEBUG], test "$enable_debug" == "yes")
 
 
 # So usually one just sets CFLAGS for this, but a configure 
@@ -130,37 +95,24 @@
 ### Checks for libraries. ######################################################
 
 # Maybe it would work with gtk+-2.8, the first sporting cairo, right?
-pkgs='gtk+-2.0 >= 2.10.0 libcroco-0.6'
+pkgs='libccss-1'
 
-
-# See http://bugzilla.gnome.org/show_bug.cgi?id=553937 .
-PKG_CHECK_EXISTS([ libcroco-0.6 >= 0.6.2 ],
-[
-  enable_libcroco_workaround="no"
-],[
-  enable_libcroco_workaround="yes"
-])
-if test "$enable_libcroco_workaround" = "yes"; then
-  AC_DEFINE([CCSS_ENABLE_LIBCROCO_WORKAROUND], [1], [Work around libcroco issue #553937])
+AC_MSG_CHECKING([for gtk support in libccss])
+with_gtk=`$PKG_CONFIG --variable=ccss_with_gtk libccss-1`
+if test "$with_gtk" == "yes"; then
+  AC_MSG_RESULT([$with_gtk])
+else
+  AC_MSG_ERROR([libccss without gtk support, not sufficient for gtk-css-engine])
+fi
+
+AC_MSG_CHECKING([for gtk support in libccss])
+with_rsvg=`$PKG_CONFIG --variable=ccss_with_rsvg libccss-1`
+if test "$with_rsvg" == "yes"; then
+  AC_MSG_RESULT([$with_rsvg])
+else
+  AC_MSG_WARN([libccss without rsvg support, SVG images will not be supported])
 fi
 
-
-# Guessing a version.
-rsvg_req='librsvg-2.0 >= 2.16'
-PKG_CHECK_EXISTS([ $rsvg_req ],
-[
-  with_rsvg="yes"
-  pkgs="$pkgs $rsvg_req"
-],[
-  with_rsvg="no"
-])
-
-if test "$with_rsvg" = "yes"; then
-  AC_DEFINE([CCSS_WITH_RSVG], [1], [SVG support through librsvg])
-fi
-AM_CONDITIONAL([CCSS_WITH_RSVG], [test "$with_rsvg" = "yes"])
-
-
 soup_req='libsoup-2.4'
 PKG_CHECK_EXISTS([ $soup_req ],
 [
@@ -171,38 +123,19 @@
 ])
 
 if test "$with_soup" = "yes"; then
-  AC_DEFINE([CCSS_WITH_SOUP], [1], [URI parsing support through libsoup])
+  AC_DEFINE([GCE_WITH_SOUP], [1], [URI parsing support through libsoup])
 fi
-AM_CONDITIONAL([CCSS_WITH_SOUP], [test "$with_soup" = "yes"])
-
-
-clutter_req='clutter-cairo-0.8'
-PKG_CHECK_EXISTS([ $clutter_req ],
-[
-  with_clutter="yes"
-  pkgs="$pkgs $clutter_req"
-],[
-  with_clutter="no"
-])
-
-AM_CONDITIONAL([CCSS_WITH_CLUTTER], [test "$with_clutter" = "yes"])
-
-
-PKG_CHECK_MODULES(CCSS, $pkgs)
-
-AC_SUBST([CCSS_CFLAGS])
-AC_SUBST([CCSS_LIBS])
-AC_SUBST([CCSS_DEPS], $pkgs)
+AM_CONDITIONAL([GCE_WITH_SOUP], [test "$with_soup" = "yes"])
 
-AC_DEFINE([CCSS_WITH_GTK], [1], [Support for drawing Gtk+ primitives like `box-gap'])
-AM_CONDITIONAL([CCSS_WITH_GTK], [test "yes" = "yes"])
 
+PKG_CHECK_MODULES(GCE, $pkgs)
 
-AC_SUBST([GCE_CFLAGS], [$CCSS_CFLAGS])
-AC_SUBST([GCE_LIBS], [$CCSS_LIBS])
+AC_SUBST([GCE_CFLAGS])
+AC_SUBST([GCE_LIBS])
+AC_SUBST([GCE_DEPS], $pkgs)
 
-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-AC_SUBST(GTK_VERSION)
+AC_DEFINE([GCE_WITH_GTK], [1], [Support for drawing Gtk+ primitives like `box-gap'])
+AM_CONDITIONAL([GCE_WITH_GTK], [test "yes" = "yes"])
 
 
 ### Checks for header files. ###################################################
@@ -239,13 +172,6 @@
 AC_CONFIG_FILES([
   Makefile
   doc/Makefile
-  libccss/Makefile
-  libccss/libccss-1.pc
-  libccss/cccss/Makefile
-  libccss/ccss/Makefile
-  libccss/doc/Makefile
-  libccss/doc/version.xml
-  libccss/examples/Makefile
   src/Makefile
   themes/Makefile
   themes/Gilouche-CSS/Makefile
@@ -258,13 +184,11 @@
 Configuration
 -------------
 
-Libccss:
+Libgce:
     CFLAGS                       ${CFLAGS}
     Build debugging code         $enable_debug
-    Standalone libccss           $enable_libccss
     Support for SVG images       $with_rsvg (requires librsvg)
 WIP Support for SVG fragments    $with_soup (requires libsoup)
-WIP Clutter support              ${with_clutter}
 
 Theme engine:
     Rapid development            $enable_rapid_development (WARNING: this breaks theme switching)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Oct  6 14:34:59 2008
@@ -3,9 +3,7 @@
 # http://www.gnu.org/software/libtool/manual/automake/Libtool-Issues.html
 
 _cppflags = \
-	$(GCE_CFLAGS) \
-	-I$(top_srcdir)/libccss \
-	-I$(top_builddir)/libccss
+	$(GCE_CFLAGS)
 
 enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
 
@@ -20,8 +18,7 @@
 	-export-symbols $(srcdir)/exports.sym
 
 libcss_la_LIBADD = \
-	$(GCE_LIBS) \
-	./../libccss/ccss/libccss-1.la
+	$(GCE_LIBS)
 
 libcss_la_SOURCES = \
 	gce-color.c \
@@ -50,8 +47,7 @@
 	gce-serialize.h
 
 css2gtkrc_LDADD = \
-	$(GCE_LIBS) \
-	./../libccss/ccss/libccss-1.la
+	$(GCE_LIBS)
 
 EXTRA_DIST = \
 	exports.sym