applied a patch from Kjartan Maraas to replace the g_strup()

2004-03-04  Dodji Seketeli  <dodji@gnome.org>

* src/cr-enc-handler.c:
(cr_enc_handler_resolve_enc_alias): applied a patch
from Kjartan Maraas to replace the g_strup() g_ascii_strup().
This closes
* csslint/Makefile.am,src/cr-simple-sel.h,src/cr-term.h
src/cr-token.h,tests/Makefile.am:
Applied patch
http://bugzilla.gnome.org/showattachment.cgi?attach_id=23422.
Modified the patch a little bit so that I use prog_LDFLAGS instead
of AM_LDFLAGS. AM_LDFLAGS just seems not to be supported by my
automake-1.4.
This fixes http://bugzilla.gnome.org/show_bug.cgi?id=131643 .
* tests/test-output-refs/test4.2.css.out: updated this non
regresstion test reference output due to a small modification
in the @page rule dump format.

9 files changed, 40 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ae9f5b..e3dffa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-03-04  Dodji Seketeli  <dodji@gnome.org>
+
+	* src/cr-enc-handler.c:
+	(cr_enc_handler_resolve_enc_alias): applied a patch
+	from Kjartan Maraas to replace the g_strup() g_ascii_strup().
+	This closes 
+	* csslint/Makefile.am,src/cr-simple-sel.h,src/cr-term.h
+	src/cr-token.h,tests/Makefile.am:
+	Applied patch
+	http://bugzilla.gnome.org/showattachment.cgi?attach_id=23422.
+	Modified the patch a little bit so that I use prog_LDFLAGS instead
+	of AM_LDFLAGS. AM_LDFLAGS just seems not to be supported by my
+	automake-1.4.
+	This fixes http://bugzilla.gnome.org/show_bug.cgi?id=131643 .
+	* tests/test-output-refs/test4.2.css.out: updated this non
+	regresstion test reference output due to a small modification
+	in the @page rule dump format.
+
 2004-03-03  Dodji Seketeli  <dodji@gnome.org>
 
 	* csslint/csslint.c:
diff --git a/configure.in b/configure.in
index dd53b16..df9361a 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,10 @@ AC_INIT(src/cr-input.c)
 PACKAGE=libcroco
 AC_CANONICAL_TARGET
 
+AM_INIT_AUTOMAKE($PACKAGE, $LIBCROCO_VERSION)
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
 LIBCROCO_MAJOR_VERSION=0
 LIBCROCO_MINOR_VERSION=4
 LIBCROCO_MICRO_VERSION=0
@@ -26,9 +30,6 @@ AC_SUBST(LIBCROCO_VERSION_INFO)
 AC_SUBST(LIBCROCO_VERSION_NUMBER)
 AC_SUBST(VERSION)
 
-AM_INIT_AUTOMAKE($PACKAGE, $LIBCROCO_VERSION)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
 dnl
 dnl First, here goes the list
 dnl of the version of the libraries we depend
@@ -130,25 +131,11 @@ 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="$GLIB2_LIBS $LIBXML2_LIBS -L${libdir} -lcroco"
-
-CROCO_CFLAGS="-I${includedir}/libcroco -I${includedir}/libcroco \
-$GLIB2_CFLAGS $LIBXML2_CFLAGS"
-
-if test "$USE_LIBXML2" = "yes" ; then
-	LIBXML2_LIBS=`pkg-config --libs libxml-2.0`
-	CROCO_LIBS="$CROCO_LIBS $LIBXML2_LIBS"
-	LIBXML2_CFLAGS=`pkg-config --cflags libxml-2.0`
-	CROCO_CFLAGS="$CROCO_CFLAGS $LIBXML2_CFLAGS"
-	REQUIRE_LIBXML2=libxml-2.0
-else
-	REQUIRE_LIBXML2=
-fi
-
+CROCO_LIBS="-L${libdir} -lcroco"
+CROCO_CFLAGS="-I${includedir}/libcroco"
 
 AC_SUBST(LIBXML2_LIBS)
 AC_SUBST(LIBXML2_CFLAGS)
-AC_SUBST(REQUIRE_LIBXML2)
 AC_SUBST(CROCO_CFLAGS)
 AC_SUBST(CROCO_LIBS)
 
diff --git a/csslint/Makefile.am b/csslint/Makefile.am
index da0b081..e301c05 100644
--- a/csslint/Makefile.am
+++ b/csslint/Makefile.am
@@ -11,8 +11,7 @@ INCLUDES=-I$(top_srcdir)/intl \
 	@GLIB2_CFLAGS@ \
 	@LIBXML2_CFLAGS@
 
+csslint_LDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@
 AM_CFLAGS=$(INCLUDES)
 
-LDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@
-
 EXTRA_DIST = $(man_MANS)
diff --git a/src/cr-enc-handler.c b/src/cr-enc-handler.c
index 85ad1c5..4789aa5 100644
--- a/src/cr-enc-handler.c
+++ b/src/cr-enc-handler.c
@@ -122,7 +122,7 @@ cr_enc_handler_resolve_enc_alias (const guchar *a_alias_name,
 	g_return_val_if_fail (a_alias_name != NULL, CR_BAD_PARAM_ERROR) ;
 
 	alias_name_up = g_strdup (a_alias_name) ;
-	g_strup (alias_name_up) ;
+	g_ascii_strup (alias_name_up, -1) ;
 
 	for (i = 0 ; gv_default_aliases[i].name ; i++)
 	{
diff --git a/src/cr-simple-sel.h b/src/cr-simple-sel.h
index b54ee5e..589aaa6 100644
--- a/src/cr-simple-sel.h
+++ b/src/cr-simple-sel.h
@@ -50,7 +50,7 @@ enum SimpleSelectorType
 {
         NO_SELECTOR_TYPE = 0,
         UNIVERSAL_SELECTOR = 1,
-        TYPE_SELECTOR = 1 << 1,
+        TYPE_SELECTOR = 1 << 1
 } ;
 
 typedef struct _CRSimpleSel CRSimpleSel ;
diff --git a/src/cr-term.h b/src/cr-term.h
index 94a9d14..89b460c 100644
--- a/src/cr-term.h
+++ b/src/cr-term.h
@@ -50,7 +50,7 @@ enum CRTermType
         TERM_URI,
         TERM_RGB,
         TERM_UNICODERANGE,
-        TERM_HASH,
+        TERM_HASH
 } ;
 
 
diff --git a/src/cr-token.h b/src/cr-token.h
index b5ef024..3e2f907 100644
--- a/src/cr-token.h
+++ b/src/cr-token.h
@@ -74,7 +74,7 @@ enum CRTokenType
         BO_TK, /*opening bracket*/
         BC_TK, /*closing bracket*/
         DELIM_TK,
-        VENDOR_SPECIFIC_IDENT_TK,
+        VENDOR_SPECIFIC_IDENT_TK
 } ;
 
 enum CRTokenExtraType
@@ -92,7 +92,7 @@ enum CRTokenExtraType
         TIME_MS_ET,
         TIME_S_ET,
         FREQ_HZ_ET,
-        FREQ_KHZ_ET,
+        FREQ_KHZ_ET
 } ;
  
 typedef struct _CRToken CRToken ;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d2bd1fd..e17e2fa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,22 +1,28 @@
 SUBDIRS=test-inputs test-output-refs
 
 #the list of all possible tests goes here.
-#The real tests that are gonna be compiled are defined
-#in configure.in due to automake AM_CONDITIONAL() being bugged
+
+EXTRALDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@
 testprogs=test0 test1 test2 test3 test4 test5 test6
 noinst_PROGRAMS=$(testprogs)
 test0_SOURCES=test0-main.c
+test0_LDFLAGS=$(EXTRALDFLAGS)
 test1_SOURCES=test1-main.c
+test1_LDFLAGS=$(EXTRALDFLAGS)
 test2_SOURCES=test2-main.c cr-test-utils.c cr-test-utils.h
+test2_LDFLAGS=$(EXTRALDFLAGS)
 test3_SOURCES=test3-main.c cr-test-utils.c cr-test-utils.h
+test3_LDFLAGS=$(EXTRALDFLAGS)
 test4_SOURCES=test4-main.c cr-test-utils.c cr-test-utils.h
+test4_LDFLAGS=$(EXTRALDFLAGS)
 test5_SOURCES=test5-main.c cr-test-utils.c cr-test-utils.h
+test5_LDFLAGS=$(EXTRALDFLAGS)
 test6_SOURCES=test6-main.c cr-test-utils.c cr-test-utils.h
+test6_LDFLAGS=$(EXTRALDFLAGS)
 
 croco_lib=$(top_builddir)/src/@CROCO_LIB@
 LDADD=$(croco_lib)
 
 INCLUDES=-I$(top_srcdir)/intl -I$(top_srcdir)/src
 
-LDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@
 AM_CFLAGS=-I. @LIBXML2_CFLAGS@ @GLIB2_CFLAGS@
diff --git a/tests/test-output-refs/test4.2.css.out b/tests/test-output-refs/test4.2.css.out
index ed74f8d..ae12244 100644
--- a/tests/test-output-refs/test4.2.css.out
+++ b/tests/test-output-refs/test4.2.css.out
@@ -7,7 +7,7 @@
   src : url(http://site/fonts/rob-celt)
 }
 
-@page left:one-two {
+@page left :one-two {
   margin : 10pt;
   border : none
 }