synchronize with libcroco--mainline--0.6--patch-28.tla-cvs-synch-06-09-2004-0

2004-06-09  Dodji Seketeli  <dodji@gnome.org>

	    synchronize with libcroco--mainline--0.6--patch-28.

10 files changed, 65 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 8fcca1a..a4c9a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-06-09  Dodji Seketeli  <dodji@gnome.org>
+
+	* configure.in: fixed the pkg-config and croco-0.6-config output.
+	* docs/exmaples/*.c: updated the comments.
+
+2004-06-08  Dodji Seketeli  <dodji@gnome.org>
+
+	* tests/global-vars.sh.in,csslint/Makefile.am,Makefile.am,src/Makefile.am:
+	Make libcroco be parallel installable.
+	That is, make libcroco.so become libcroco-$(major)-$(minor),
+	same thing for the usr/include/libcroco dir, the pkgconfig and
+	croco-config file. Removed tests/global-vars.sh and generate it
+	it from global-vars.sh.in
+	Bump version number to 0.5.2
+	
 2004-05-31  Dodji Seketeli  <dodji@gnome.org>
 
 	* docs/examples/selection-example-1.c:
diff --git a/Makefile.am b/Makefile.am
index 5974bf3..b93330d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,39 @@
 SUBDIRS = src csslint docs
 SUBDIRS += tests
 
+PKG_CONFIG_FILE_UNINSTALLED=libcroco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-uninstalled.pc
+PKG_CONFIG_FILE=libcroco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@.pc
+
 pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=libcroco.pc
+pkgconfig_DATA=$(PKG_CONFIG_FILE)
+
+INCLUDE_DIR_NAME=@PACKAGE@-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@
+extraincludedir=$(includedir)/$INCLUDE_DIR_NAME
+
+CROCO_CONFIG_FILE_UNINSTALLED=croco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-config-uninstalled
+CROCO_CONFIG_FILE=croco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-config
+bin_SCRIPTS=$(CROCO_CONFIG_FILE)
+
+#man_MANS = croco-config.1
+
+EXTRA_DIST= croco-config.in $(PKG_CONFIG_FILE) TODO Doxyfile \
+HACKING COPYING.LIB COPYING  libcroco.spec
+
+all-local: $(PKG_CONFIG_FILE_UNINSTALLED) $(PKG_CONFIG_FILE) \
+$(CROCO_CONFIG_FILE_UNINSTALLED) $(CROCO_CONFIG_FILE)
+
 
-extraincludedir=$(includedir)/@PACKAGE@
+%-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@.pc: %.pc
+	cp $< $@
 
-bin_SCRIPTS=croco-config
+%-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-uninstalled.pc: %.pc
+	cp $< $@
 
-man_MANS = croco-config.1
+%-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-config: %-config
+	cp $< $@
 
-EXTRA_DIST= croco-config.in libcroco.pc libcroco.spec TODO Doxyfile \
-HACKING COPYING.LIB COPYING  libcroco.spec $(man_MANS)
+%-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-config-uninstalled: %-config
+	cp $< $@
 
 cleantar:
 	@(rm -f libcroco*.tar.gz)
diff --git a/configure.in b/configure.in
index cdda699..0fbc02f 100644
--- a/configure.in
+++ b/configure.in
@@ -101,7 +101,7 @@ PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= $LIBXML2_VERSION],
 AC_SUBST(LIBXML2_VERSION)
 AC_SUBST(CROCO_HAVE_LIBXML2)
 
-CROCO_LIB=libcroco.la
+CROCO_LIB=libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION.la
 AC_SUBST(CROCO_LIB)
 
 
@@ -131,8 +131,8 @@ dnl
 dnl Define the CROCO_LIBS and CROCO_CFLAGS variables. These will be used
 dnl by client application to know where to find croco include files and libs.
 dnl
-CROCO_LIBS="-L${libdir} -lcroco"
-CROCO_CFLAGS="-I${includedir}/libcroco"
+CROCO_LIBS="-L${libdir} -lcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
+CROCO_CFLAGS="-I${includedir}/libcroco-$LIBCROCO_MAJOR_VERSION.$LIBCROCO_MINOR_VERSION"
 
 AC_SUBST(LIBXML2_LIBS)
 AC_SUBST(LIBXML2_CFLAGS)
@@ -153,6 +153,7 @@ docs/examples/Makefile
 tests/Makefile
 tests/test-inputs/Makefile
 tests/test-output-refs/Makefile
+tests/global-vars.sh
 src/Makefile
 src/libcroco-config.h
 csslint/Makefile
diff --git a/csslint/Makefile.am b/csslint/Makefile.am
index e301c05..978da9b 100644
--- a/csslint/Makefile.am
+++ b/csslint/Makefile.am
@@ -1,7 +1,7 @@
-bin_PROGRAMS = csslint
-man_MANS = csslint.1
+bin_PROGRAMS = csslint-0.6
+#man_MANS = csslint.1
 
-csslint_SOURCES = csslint.c
+csslint_0_6_SOURCES = csslint.c
 
 croco_lib=$(top_builddir)/src/@CROCO_LIB@
 LDADD=$(croco_lib)
@@ -11,7 +11,7 @@ INCLUDES=-I$(top_srcdir)/intl \
 	@GLIB2_CFLAGS@ \
 	@LIBXML2_CFLAGS@
 
-csslint_LDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@
+csslint_0_6_LDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@
 AM_CFLAGS=$(INCLUDES)
 
-EXTRA_DIST = $(man_MANS)
+#EXTRA_DIST = $(man_MANS)
diff --git a/docs/examples/cssom-example-1.c b/docs/examples/cssom-example-1.c
index a41165e..85079ce 100644
--- a/docs/examples/cssom-example-1.c
+++ b/docs/examples/cssom-example-1.c
@@ -8,7 +8,7 @@
  *
  *To compile it using gcc, type
  *
- *gcc -g -Wall `croco-config --cflags`  `croco-config --libs` -o cssom-example-1 cssom-example-1.c
+ *gcc -g -Wall `croco-0.6-config --cflags`  `croco-0.6-config --libs` -o cssom-example-1 cssom-example-1.c
  *
  *Prior to that, you must have compiled and installed libcroco, of course.
  *
diff --git a/docs/examples/sac-example-1.c b/docs/examples/sac-example-1.c
index 6e30eaa..6c241e5 100644
--- a/docs/examples/sac-example-1.c
+++ b/docs/examples/sac-example-1.c
@@ -9,7 +9,7 @@
  *
  *To compile this file, type:
  *
- *gcc -g -Wall -o sac-example-1 `croco-config --cflags`  `croco-config --libs` sac-example-1.c
+ *gcc -g -Wall -o sac-example-1 `croco-0.6-config --cflags`  `croco-0.6-config --libs` sac-example-1.c
  *
  *Make sure you have compiled and installed libcroco prior to trying to
  *compile this file :)
diff --git a/docs/examples/sac-example-2.c b/docs/examples/sac-example-2.c
index a9aa9e4..75eae9e 100644
--- a/docs/examples/sac-example-2.c
+++ b/docs/examples/sac-example-2.c
@@ -20,7 +20,7 @@
  *
  *To compile this file, type:
  *
- *gcc -g  -Wall -o sac-example-2 `croco-config --cflags`  `croco-config --libs` sac-example-2.c
+ *gcc -g  -Wall -o sac-example-2 `croco-0.6-config --cflags`  `croco-0.6-config --libs` sac-example-2.c
  *
  *Make sure you have compiled and installed libcroco prior to trying to
  *compile this file :)
@@ -131,7 +131,7 @@ start_selector_cb (CRDocHandler *a_handler,
  */
 static void
 property_cb (CRDocHandler *a_handler,
-             GString *a_name,
+             CRString *a_name,
              CRTerm *a_value,
              gboolean a_important)
 {
@@ -139,11 +139,11 @@ property_cb (CRDocHandler *a_handler,
         
         context = (struct MyFooContext *)a_handler->app_data ;
 
-        if (!context || !a_name || !a_name->str)
+        if (!context || !a_name)
                 return ;
         context->nb_props_per_ruleset ++ ;
         
-        printf ("%s : ", a_name->str) ;
+        printf ("%s : ", cr_string_peek_raw_str (a_name)) ;
         cr_term_dump (a_value, stdout) ;
         printf ("\n") ;
 }
diff --git a/docs/examples/selection-example-1.c b/docs/examples/selection-example-1.c
index 3a6d7c7..49ad5dc 100644
--- a/docs/examples/selection-example-1.c
+++ b/docs/examples/selection-example-1.c
@@ -5,7 +5,7 @@
  *
  * To compile it using gcc, type
  *
- * gcc -g -Wall `croco-config --cflags`  `croco-config --libs` -o selection-example-1 selection-example-1.c
+ * gcc -g -Wall `croco-0.6-config --cflags`  `croco-0.6-config --libs` -o selection-example-1 selection-example-1.c
  *
  * Initial author: Stefan Seefeld.
  */
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bbaac0..37afde4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 #Headers files to be distributed
-crocoincdir=$(includedir)/libcroco/@PACKAGE@
+INSTALL_DIR_NAME=@PACKAGE@-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@
+crocoincdir=$(includedir)/$(INSTALL_DIR_NAME)/libcroco
 crocoinc_HEADERS= libcroco.h \
 cr-additional-sel.h \
 cr-attr-sel.h \
@@ -85,10 +86,10 @@ cr-parsing-location.h \
 cr-string.c \
 cr-string.h
 
-lib_LTLIBRARIES=libcroco.la
-libcroco_la_SOURCES= $(SRCS)
+lib_LTLIBRARIES=libcroco-0.6.la
+libcroco_0_6_la_SOURCES= $(SRCS)
 
 INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/intl \
 @GLIB2_CFLAGS@ @LIBXML2_CFLAGS@
-libcroco_la_LDFLAGS=-version-info @LIBCROCO_VERSION_INFO@ \
+libcroco_0_6_la_LDFLAGS=-version-info @LIBCROCO_VERSION_INFO@ \
 @GLIB2_CFLAGS@
diff --git a/tests/global-vars.sh b/tests/global-vars.sh.in
index 2fc8473..e291459 100644
--- a/tests/global-vars.sh
+++ b/tests/global-vars.sh.in
@@ -1,5 +1,5 @@
 TEST_INPUTS_DIR=$HERE_DIR/test-inputs
-CSSLINT=$HERE_DIR/../csslint/.libs/csslint
+CSSLINT=$HERE_DIR/../csslint/.libs/csslint-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@
 if ! test -x $CSSLINT ; then
     echo "Aarg Could not find an executable csslint. I was looking for $CSSLINT"
     echo $