From: Bruno Haible Date: Wed, 15 Nov 2006 13:08:36 +0000 (+0000) Subject: New module 'libcroco'. X-Git-Tag: v0.17~643 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12c2cbaf0efad6fa5c213cb92ae35e6926f4d81a;p=thirdparty%2Fgettext.git New module 'libcroco'. --- diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 4e6afbcbf..25108429f 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,63 @@ +2006-11-12 Bruno Haible + + * modules/libcroco: New file. + * m4/libcroco.m4: New file. + * lib/libcroco/cr-additional-sel.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-additional-sel.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-attr-sel.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-attr-sel.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-cascade.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-cascade.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-declaration.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-declaration.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-doc-handler.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-doc-handler.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-enc-handler.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-enc-handler.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-fonts.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-fonts.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-input.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-input.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-num.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-num.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-om-parser.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-om-parser.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-parser.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-parser.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-parsing-location.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-parsing-location.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-prop-list.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-prop-list.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-pseudo.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-pseudo.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-rgb.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-rgb.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-sel-eng.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-sel-eng.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-selector.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-selector.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-simple-sel.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-simple-sel.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-statement.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-statement.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-string.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-string.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-style.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-style.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-stylesheet.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-stylesheet.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-term.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-term.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-tknzr.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-tknzr.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-token.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-token.h: New file, from libcroco-0.6.1. + * lib/libcroco/cr-utils.c: New file, from libcroco-0.6.1. + * lib/libcroco/cr-utils.h: New file, from libcroco-0.6.1. + * lib/libcroco/libcroco-config.h: New file, from libcroco-0.6.1. + * lib/libcroco/libcroco.h: New file, from libcroco-0.6.1. + * Makefile.am (EXTRA_DIST): Add the new files. + 2006-11-12 Bruno Haible * modules/libglib: New file. diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index dbd301d01..08f96a760 100644 --- a/gnulib-local/Makefile.am +++ b/gnulib-local/Makefile.am @@ -71,6 +71,60 @@ lib/html-ostream.oo.h \ lib/iconv-ostream.oo.c \ lib/iconv-ostream.oo.h \ lib/javacomp.c.diff \ +lib/libcroco/cr-additional-sel.c \ +lib/libcroco/cr-additional-sel.h \ +lib/libcroco/cr-attr-sel.c \ +lib/libcroco/cr-attr-sel.h \ +lib/libcroco/cr-cascade.c \ +lib/libcroco/cr-cascade.h \ +lib/libcroco/cr-declaration.c \ +lib/libcroco/cr-declaration.h \ +lib/libcroco/cr-doc-handler.c \ +lib/libcroco/cr-doc-handler.h \ +lib/libcroco/cr-enc-handler.c \ +lib/libcroco/cr-enc-handler.h \ +lib/libcroco/cr-fonts.c \ +lib/libcroco/cr-fonts.h \ +lib/libcroco/cr-input.c \ +lib/libcroco/cr-input.h \ +lib/libcroco/cr-num.c \ +lib/libcroco/cr-num.h \ +lib/libcroco/cr-om-parser.c \ +lib/libcroco/cr-om-parser.h \ +lib/libcroco/cr-parser.c \ +lib/libcroco/cr-parser.h \ +lib/libcroco/cr-parsing-location.c \ +lib/libcroco/cr-parsing-location.h \ +lib/libcroco/cr-prop-list.c \ +lib/libcroco/cr-prop-list.h \ +lib/libcroco/cr-pseudo.c \ +lib/libcroco/cr-pseudo.h \ +lib/libcroco/cr-rgb.c \ +lib/libcroco/cr-rgb.h \ +lib/libcroco/cr-sel-eng.c \ +lib/libcroco/cr-sel-eng.h \ +lib/libcroco/cr-selector.c \ +lib/libcroco/cr-selector.h \ +lib/libcroco/cr-simple-sel.c \ +lib/libcroco/cr-simple-sel.h \ +lib/libcroco/cr-statement.c \ +lib/libcroco/cr-statement.h \ +lib/libcroco/cr-string.c \ +lib/libcroco/cr-string.h \ +lib/libcroco/cr-style.c \ +lib/libcroco/cr-style.h \ +lib/libcroco/cr-stylesheet.c \ +lib/libcroco/cr-stylesheet.h \ +lib/libcroco/cr-term.c \ +lib/libcroco/cr-term.h \ +lib/libcroco/cr-tknzr.c \ +lib/libcroco/cr-tknzr.h \ +lib/libcroco/cr-token.c \ +lib/libcroco/cr-token.h \ +lib/libcroco/cr-utils.c \ +lib/libcroco/cr-utils.h \ +lib/libcroco/libcroco-config.h \ +lib/libcroco/libcroco.h \ lib/libxml/COPYING \ lib/libxml/DOCBparser.c \ lib/libxml/DOCBparser_.h \ @@ -197,6 +251,7 @@ m4/ChangeLog.1 \ m4/exitfail.m4.diff \ m4/gcj.m4 \ m4/hard-locale.m4.diff \ +m4/libcroco.m4 \ m4/libglib.m4 \ m4/libxml.m4 \ m4/java.m4 \ @@ -227,6 +282,7 @@ modules/html-ostream \ modules/iconv-ostream \ modules/java \ modules/javacomp.diff \ +modules/libcroco \ modules/libglib \ modules/libxml \ modules/memory-ostream \ diff --git a/gnulib-local/m4/libcroco.m4 b/gnulib-local/m4/libcroco.m4 new file mode 100644 index 000000000..b95da3fcb --- /dev/null +++ b/gnulib-local/m4/libcroco.m4 @@ -0,0 +1,122 @@ +# libcroco.m4 serial 1 (gettext-0.16.1) +dnl Copyright (C) 2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_DEFUN([gl_LIBCROCO], +[ + dnl libcroco depends on libglib. + AC_REQUIRE([gl_LIBGLIB]) + + AC_MSG_CHECKING([whether included libcroco is requested]) + AC_ARG_WITH([included-libcroco], + [ --with-included-libcroco use the libcroco included here], + [gl_cv_libcroco_force_included=$withval], + [gl_cv_libcroco_force_included=no]) + AC_MSG_RESULT([$gl_cv_libcroco_force_included]) + + gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included" + LIBCROCO= + LTLIBCROCO= + INCCROCO= + if test "$gl_cv_libcroco_use_included" != yes; then + dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to + dnl use the included one. + AC_CACHE_VAL([gl_cv_libcroco], [ + gl_cv_libcroco=no + gl_cv_LIBCROCO= + gl_cv_LTLIBCROCO= + gl_cv_INCCROCO= + gl_save_LIBS="$LIBS" + dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and + dnl INCCROCO_0_6 accordingly. + dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when + dnl cross-compiling or when the C compiler in use is different from the + dnl one that built the library. + AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) + LIBS="$gl_save_LIBS $LIBCROCO_0_6" + AC_TRY_LINK([#include ], + [const char *version = LIBCROCO_VERSION; return !version;], + [gl_cv_libcroco=yes + gl_cv_LIBCROCO="$LIBCROCO_0_6" + gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" + ]) + if test "$gl_cv_libcroco" != yes; then + gl_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" + AC_TRY_LINK([#include ], + [const char *version = LIBCROCO_VERSION; return !version;], + [gl_cv_libcroco=yes + gl_cv_LIBCROCO="$LIBCROCO_0_6" + gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" + gl_cv_INCCROCO="$INCCROCO_0_6" + ]) + if test "$gl_cv_libcroco" != yes; then + dnl Often the include files are installed in + dnl /usr/include/libcroco-0.6/libcroco. + AC_TRY_LINK([#include ], + [const char *version = LIBCROCO_VERSION; return !version;], + [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) + libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` + if test -d "$libcroco_include_dir"; then + gl_cv_libcroco=yes + gl_cv_LIBCROCO="$LIBCROCO_0_6" + gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" + gl_cv_INCCROCO="-I$libcroco_include_dir" + fi + ]) + fi + CPPFLAGS="$gl_save_CPPFLAGS" + fi + LIBS="$gl_save_LIBS" + ]) + AC_MSG_CHECKING([for libcroco]) + AC_MSG_RESULT([$gl_cv_libcroco]) + if test $gl_cv_libcroco = yes; then + LIBCROCO="$gl_cv_LIBCROCO" + LTLIBCROCO="$gl_cv_LTLIBCROCO" + INCCROCO="$gl_cv_INCCROCO" + else + gl_cv_libcroco_use_included=yes + fi + fi + AC_SUBST([LIBCROCO]) + AC_SUBST([LTLIBCROCO]) + AC_SUBST([INCCROCO]) + AC_MSG_CHECKING([whether to use the included libcroco]) + AC_MSG_RESULT([$gl_cv_libcroco_use_included]) + + if test "$gl_cv_libcroco_use_included" = yes; then + AC_LIBOBJ([libcroco/cr-additional-sel]) + AC_LIBOBJ([libcroco/cr-attr-sel]) + AC_LIBOBJ([libcroco/cr-cascade]) + AC_LIBOBJ([libcroco/cr-declaration]) + AC_LIBOBJ([libcroco/cr-doc-handler]) + AC_LIBOBJ([libcroco/cr-enc-handler]) + AC_LIBOBJ([libcroco/cr-fonts]) + AC_LIBOBJ([libcroco/cr-input]) + AC_LIBOBJ([libcroco/cr-num]) + AC_LIBOBJ([libcroco/cr-om-parser]) + AC_LIBOBJ([libcroco/cr-parser]) + AC_LIBOBJ([libcroco/cr-parsing-location]) + AC_LIBOBJ([libcroco/cr-prop-list]) + AC_LIBOBJ([libcroco/cr-pseudo]) + AC_LIBOBJ([libcroco/cr-rgb]) + AC_LIBOBJ([libcroco/cr-sel-eng]) + AC_LIBOBJ([libcroco/cr-selector]) + AC_LIBOBJ([libcroco/cr-simple-sel]) + AC_LIBOBJ([libcroco/cr-statement]) + AC_LIBOBJ([libcroco/cr-string]) + AC_LIBOBJ([libcroco/cr-style]) + AC_LIBOBJ([libcroco/cr-stylesheet]) + AC_LIBOBJ([libcroco/cr-term]) + AC_LIBOBJ([libcroco/cr-tknzr]) + AC_LIBOBJ([libcroco/cr-token]) + AC_LIBOBJ([libcroco/cr-utils]) + fi + AM_CONDITIONAL([INCLUDED_LIBCROCO], + [test "$gl_cv_libcroco_use_included" = yes]) +]) diff --git a/gnulib-local/modules/libcroco b/gnulib-local/modules/libcroco new file mode 100644 index 000000000..d38d62b3c --- /dev/null +++ b/gnulib-local/modules/libcroco @@ -0,0 +1,88 @@ +Description: +Substitute for libcroco version 0.6.1. + +Files: +lib/libcroco/cr-additional-sel.c +lib/libcroco/cr-additional-sel.h +lib/libcroco/cr-attr-sel.c +lib/libcroco/cr-attr-sel.h +lib/libcroco/cr-cascade.c +lib/libcroco/cr-cascade.h +lib/libcroco/cr-declaration.c +lib/libcroco/cr-declaration.h +lib/libcroco/cr-doc-handler.c +lib/libcroco/cr-doc-handler.h +lib/libcroco/cr-enc-handler.c +lib/libcroco/cr-enc-handler.h +lib/libcroco/cr-fonts.c +lib/libcroco/cr-fonts.h +lib/libcroco/cr-input.c +lib/libcroco/cr-input.h +lib/libcroco/cr-num.c +lib/libcroco/cr-num.h +lib/libcroco/cr-om-parser.c +lib/libcroco/cr-om-parser.h +lib/libcroco/cr-parser.c +lib/libcroco/cr-parser.h +lib/libcroco/cr-parsing-location.c +lib/libcroco/cr-parsing-location.h +lib/libcroco/cr-prop-list.c +lib/libcroco/cr-prop-list.h +lib/libcroco/cr-pseudo.c +lib/libcroco/cr-pseudo.h +lib/libcroco/cr-rgb.c +lib/libcroco/cr-rgb.h +lib/libcroco/cr-sel-eng.c +lib/libcroco/cr-sel-eng.h +lib/libcroco/cr-selector.c +lib/libcroco/cr-selector.h +lib/libcroco/cr-simple-sel.c +lib/libcroco/cr-simple-sel.h +lib/libcroco/cr-statement.c +lib/libcroco/cr-statement.h +lib/libcroco/cr-string.c +lib/libcroco/cr-string.h +lib/libcroco/cr-style.c +lib/libcroco/cr-style.h +lib/libcroco/cr-stylesheet.c +lib/libcroco/cr-stylesheet.h +lib/libcroco/cr-term.c +lib/libcroco/cr-term.h +lib/libcroco/cr-tknzr.c +lib/libcroco/cr-tknzr.h +lib/libcroco/cr-token.c +lib/libcroco/cr-token.h +lib/libcroco/cr-utils.c +lib/libcroco/cr-utils.h +lib/libcroco/libcroco-config.h +lib/libcroco/libcroco.h +m4/libcroco.m4 +m4/absolute-header.m4 + +Depends-on: +libglib +libxml + +configure.ac: +gl_LIBCROCO + +Makefile.am: +AM_CPPFLAGS += $(INCGLIB) +AM_CPPFLAGS += $(INCXML) +if INCLUDED_LIBCROCO +AM_CPPFLAGS += -I$(srcdir)/libcroco +endif + +if GL_COND_LIBTOOL +lib_LDFLAGS += $(LTLIBCROCO) +endif + +Include: + + +License: +LGPL + +Maintainer: +libcroco +