From 35aaf6d0cc52693fa25020d5f5d0ddffc2bccfb2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 27 Nov 2006 12:54:58 +0000 Subject: Build the imported libraries with a C compiler, even when CC=g++. --- gnulib-local/ChangeLog | 22 ++++++++++++++++++ gnulib-local/m4/libcroco.m4 | 30 +----------------------- gnulib-local/m4/libglib.m4 | 11 ++++----- gnulib-local/m4/libxml.m4 | 48 ++++----------------------------------- gnulib-local/modules/libcroco | 33 +++++++++++++++++++++++++++ gnulib-local/modules/libglib | 16 +++++++++++++ gnulib-local/modules/libxml | 53 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 133 insertions(+), 80 deletions(-) diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 59fb0d4..43014c9 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,5 +1,27 @@ 2006-11-26 Bruno Haible + Build the imported libraries with a C compiler, even when CC=g++. + + * modules/libcroco (Depends-on): Add no-c++. + (Makefile.am): Define libcroco_rpl_la_SOURCES, + libcroco_rpl_la_CPPFLAGS. + Augment lib_LIBADD, lib_DEPENDENCIES, noinst_LTLIBRARIES. + * m4/libcroco.m4 (gl_LIBCROCO): Don't use AC_LIBOBJ. + + * modules/libglib (Depends-on): Add no-c++. + (Makefile.am): Define libglib_rpl_la_SOURCES, libglib_rpl_la_CPPFLAGS. + Augment lib_LIBADD, lib_DEPENDENCIES, noinst_LTLIBRARIES. + * m4/libglib.m4 (gl_LIBGLIB): Don't use AC_LIBOBJ. New condition + INCLUDED_LIBGLIB. + + * modules/libxml (Depends-on): Add no-c++. + (Makefile.am): Define libxml_rpl_la_SOURCES, libxml_rpl_la_CPPFLAGS. + Augment lib_LIBADD, lib_DEPENDENCIES, noinst_LTLIBRARIES. + * m4/libxml.m4 (gl_LIBXML): Don't use AC_LIBOBJ. New condition + INCLUDED_LIBXML. + +2006-11-26 Bruno Haible + libcroco uses vasprintf.h, which requires . * lib/libcroco/cr-additional-sel.c: Include . * lib/libcroco/cr-attr-sel.c: Likewise. diff --git a/gnulib-local/m4/libcroco.m4 b/gnulib-local/m4/libcroco.m4 index b95da3f..22232ef 100644 --- a/gnulib-local/m4/libcroco.m4 +++ b/gnulib-local/m4/libcroco.m4 @@ -1,4 +1,4 @@ -# libcroco.m4 serial 1 (gettext-0.16.1) +# libcroco.m4 serial 2 (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, @@ -89,34 +89,6 @@ AC_DEFUN([gl_LIBCROCO], 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/m4/libglib.m4 b/gnulib-local/m4/libglib.m4 index 952bb89..2db218f 100644 --- a/gnulib-local/m4/libglib.m4 +++ b/gnulib-local/m4/libglib.m4 @@ -1,4 +1,4 @@ -# libglib.m4 serial 1 (gettext-0.16.1) +# libglib.m4 serial 2 (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, @@ -95,12 +95,6 @@ AC_DEFUN([gl_LIBGLIB], LIBGLIB_H="$LIBGLIB_H glib/gstrfuncs.h" LIBGLIB_H="$LIBGLIB_H glib/gstring.h" LIBGLIB_H="$LIBGLIB_H glib/gtypes.h" - AC_LIBOBJ([glib/ghash]) - AC_LIBOBJ([glib/glist]) - AC_LIBOBJ([glib/gmessages]) - AC_LIBOBJ([glib/gprimes]) - AC_LIBOBJ([glib/gstrfuncs]) - AC_LIBOBJ([glib/gstring]) AC_REQUIRE([AC_GNU_SOURCE]) AC_CHECK_HEADERS([unistd.h]) dnl Don't bother checking for pthread.h and other multithread facilities. @@ -108,4 +102,7 @@ AC_DEFUN([gl_LIBGLIB], LIBGLIB_H= fi AC_SUBST([LIBGLIB_H]) + + AM_CONDITIONAL([INCLUDED_LIBGLIB], + [test "$gl_cv_libglib_use_included" = yes]) ]) diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4 index 5d9c6cf..eea603d 100644 --- a/gnulib-local/m4/libxml.m4 +++ b/gnulib-local/m4/libxml.m4 @@ -1,4 +1,4 @@ -# libxml.m4 serial 1 (gettext-0.16.1) +# libxml.m4 serial 2 (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, @@ -137,49 +137,6 @@ AC_DEFUN([gl_LIBXML], LIBXML_H="$LIBXML_H libxml/xpath.h" LIBXML_H="$LIBXML_H libxml/xpathInternals.h" LIBXML_H="$LIBXML_H libxml/xpointer.h" - AC_LIBOBJ([libxml/DOCBparser]) - AC_LIBOBJ([libxml/HTMLparser]) - AC_LIBOBJ([libxml/HTMLtree]) - AC_LIBOBJ([libxml/SAX]) - AC_LIBOBJ([libxml/SAX2]) - AC_LIBOBJ([libxml/c14n]) - AC_LIBOBJ([libxml/catalog]) - AC_LIBOBJ([libxml/chvalid]) - AC_LIBOBJ([libxml/debugXML]) - AC_LIBOBJ([libxml/dict]) - AC_LIBOBJ([libxml/encoding]) - AC_LIBOBJ([libxml/entities]) - AC_LIBOBJ([libxml/error]) - AC_LIBOBJ([libxml/globals]) - AC_LIBOBJ([libxml/hash]) - AC_LIBOBJ([libxml/legacy]) - AC_LIBOBJ([libxml/list]) - AC_LIBOBJ([libxml/nanoftp]) - AC_LIBOBJ([libxml/nanohttp]) - AC_LIBOBJ([libxml/parser]) - AC_LIBOBJ([libxml/parserInternals]) - AC_LIBOBJ([libxml/pattern]) - AC_LIBOBJ([libxml/relaxng]) - AC_LIBOBJ([libxml/schematron]) - AC_LIBOBJ([libxml/threads]) - AC_LIBOBJ([libxml/tree]) - AC_LIBOBJ([libxml/uri]) - AC_LIBOBJ([libxml/valid]) - AC_LIBOBJ([libxml/xinclude]) - AC_LIBOBJ([libxml/xlink]) - AC_LIBOBJ([libxml/xmlIO]) - AC_LIBOBJ([libxml/xmlmemory]) - AC_LIBOBJ([libxml/xmlmodule]) - AC_LIBOBJ([libxml/xmlreader]) - AC_LIBOBJ([libxml/xmlregexp]) - AC_LIBOBJ([libxml/xmlsave]) - AC_LIBOBJ([libxml/xmlschemas]) - AC_LIBOBJ([libxml/xmlschemastypes]) - AC_LIBOBJ([libxml/xmlstring]) - AC_LIBOBJ([libxml/xmlunicode]) - AC_LIBOBJ([libxml/xmlwriter]) - AC_LIBOBJ([libxml/xpath]) - AC_LIBOBJ([libxml/xpointer]) AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h ctype.h dlfcn.h dl.h errno.h \ fcntl.h float.h limits.h malloc.h math.h netdb.h \ netinet/in.h resolv.h signal.h stdlib.h string.h \ @@ -193,4 +150,7 @@ AC_DEFUN([gl_LIBXML], LIBXML_H= fi AC_SUBST([LIBXML_H]) + + AM_CONDITIONAL([INCLUDED_LIBXML], + [test "$gl_cv_libxml_use_included" = yes]) ]) diff --git a/gnulib-local/modules/libcroco b/gnulib-local/modules/libcroco index d38d62b..909892c 100644 --- a/gnulib-local/modules/libcroco +++ b/gnulib-local/modules/libcroco @@ -62,6 +62,7 @@ m4/absolute-header.m4 Depends-on: libglib libxml +no-c++ configure.ac: gl_LIBCROCO @@ -71,8 +72,40 @@ AM_CPPFLAGS += $(INCGLIB) AM_CPPFLAGS += $(INCXML) if INCLUDED_LIBCROCO AM_CPPFLAGS += -I$(srcdir)/libcroco +lib_LIBADD += libcroco_rpl.la +lib_DEPENDENCIES += libcroco_rpl.la +noinst_LTLIBRARIES += libcroco_rpl.la endif +libcroco_rpl_la_SOURCES = \ + libcroco/cr-additional-sel.c \ + libcroco/cr-attr-sel.c \ + libcroco/cr-cascade.c \ + libcroco/cr-declaration.c \ + libcroco/cr-doc-handler.c \ + libcroco/cr-enc-handler.c \ + libcroco/cr-fonts.c \ + libcroco/cr-input.c \ + libcroco/cr-num.c \ + libcroco/cr-om-parser.c \ + libcroco/cr-parser.c \ + libcroco/cr-parsing-location.c \ + libcroco/cr-prop-list.c \ + libcroco/cr-pseudo.c \ + libcroco/cr-rgb.c \ + libcroco/cr-sel-eng.c \ + libcroco/cr-selector.c \ + libcroco/cr-simple-sel.c \ + libcroco/cr-statement.c \ + libcroco/cr-string.c \ + libcroco/cr-style.c \ + libcroco/cr-stylesheet.c \ + libcroco/cr-term.c \ + libcroco/cr-tknzr.c \ + libcroco/cr-token.c \ + libcroco/cr-utils.c +libcroco_rpl_la_CPPFLAGS = $(AM_CPPFLAGS) $(NO_CXX) + if GL_COND_LIBTOOL lib_LDFLAGS += $(LTLIBCROCO) endif diff --git a/gnulib-local/modules/libglib b/gnulib-local/modules/libglib index 2c8c4c0..f7abe87 100644 --- a/gnulib-local/modules/libglib +++ b/gnulib-local/modules/libglib @@ -22,11 +22,27 @@ Depends-on: vasprintf xalloc xvasprintf +no-c++ configure.ac: gl_LIBGLIB Makefile.am: +if INCLUDED_LIBGLIB +lib_LIBADD += libglib_rpl.la +lib_DEPENDENCIES += libglib_rpl.la +noinst_LTLIBRARIES += libglib_rpl.la +endif + +libglib_rpl_la_SOURCES = \ + glib/ghash.c \ + glib/glist.c \ + glib/gmessages.c \ + glib/gprimes.c \ + glib/gstrfuncs.c \ + glib/gstring.c +libglib_rpl_la_CPPFLAGS = $(AM_CPPFLAGS) $(NO_CXX) + BUILT_SOURCES += $(LIBGLIB_H) glib.h: glib_.h diff --git a/gnulib-local/modules/libxml b/gnulib-local/modules/libxml index 8877c73..690dc7f 100644 --- a/gnulib-local/modules/libxml +++ b/gnulib-local/modules/libxml @@ -100,11 +100,64 @@ m4/absolute-header.m4 Depends-on: iconv +no-c++ configure.ac: gl_LIBXML Makefile.am: +if INCLUDED_LIBXML +lib_LIBADD += libxml_rpl.la +lib_DEPENDENCIES += libxml_rpl.la +noinst_LTLIBRARIES += libxml_rpl.la +endif + +libxml_rpl_la_SOURCES = \ + libxml/DOCBparser.c \ + libxml/HTMLparser.c \ + libxml/HTMLtree.c \ + libxml/SAX.c \ + libxml/SAX2.c \ + libxml/c14n.c \ + libxml/catalog.c \ + libxml/chvalid.c \ + libxml/debugXML.c \ + libxml/dict.c \ + libxml/encoding.c \ + libxml/entities.c \ + libxml/error.c \ + libxml/globals.c \ + libxml/hash.c \ + libxml/legacy.c \ + libxml/list.c \ + libxml/nanoftp.c \ + libxml/nanohttp.c \ + libxml/parser.c \ + libxml/parserInternals.c \ + libxml/pattern.c \ + libxml/relaxng.c \ + libxml/schematron.c \ + libxml/threads.c \ + libxml/tree.c \ + libxml/uri.c \ + libxml/valid.c \ + libxml/xinclude.c \ + libxml/xlink.c \ + libxml/xmlIO.c \ + libxml/xmlmemory.c \ + libxml/xmlmodule.c \ + libxml/xmlreader.c \ + libxml/xmlregexp.c \ + libxml/xmlsave.c \ + libxml/xmlschemas.c \ + libxml/xmlschemastypes.c \ + libxml/xmlstring.c \ + libxml/xmlunicode.c \ + libxml/xmlwriter.c \ + libxml/xpath.c \ + libxml/xpointer.c +libxml_rpl_la_CPPFLAGS = $(AM_CPPFLAGS) $(NO_CXX) + BUILT_SOURCES += $(LIBXML_H) libxml/DOCBparser.h: libxml/DOCBparser_.h -- cgit v1.1