From c95ce4b301b073a10cf7d0b9077ed3a605b34a17 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 15 Dec 2002 00:42:37 +0000 Subject: [PATCH] Set TRIO_LIBS when building with trio. * configure.in: Set TRIO_LIBS when building with trio. * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ configure.in | 4 +++- glib-2.0.pc.in | 3 ++- glib/trio/Makefile.am | 2 +- 10 files changed, 48 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c18506..7d8fdcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2002-12-15 Matthias Clasen + * configure.in: Set TRIO_LIBS when building with trio. + + * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. + + * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. + * glib/trio/glibtrio.h: New file, redefining all trio symbols to fall into the _G/_g_ private glib namespace. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0c18506..7d8fdcb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2002-12-15 Matthias Clasen + * configure.in: Set TRIO_LIBS when building with trio. + + * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. + + * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. + * glib/trio/glibtrio.h: New file, redefining all trio symbols to fall into the _G/_g_ private glib namespace. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 0c18506..7d8fdcb 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,11 @@ 2002-12-15 Matthias Clasen + * configure.in: Set TRIO_LIBS when building with trio. + + * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. + + * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. + * glib/trio/glibtrio.h: New file, redefining all trio symbols to fall into the _G/_g_ private glib namespace. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0c18506..7d8fdcb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,11 @@ 2002-12-15 Matthias Clasen + * configure.in: Set TRIO_LIBS when building with trio. + + * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. + + * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. + * glib/trio/glibtrio.h: New file, redefining all trio symbols to fall into the _G/_g_ private glib namespace. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0c18506..7d8fdcb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,11 @@ 2002-12-15 Matthias Clasen + * configure.in: Set TRIO_LIBS when building with trio. + + * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. + + * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. + * glib/trio/glibtrio.h: New file, redefining all trio symbols to fall into the _G/_g_ private glib namespace. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0c18506..7d8fdcb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,11 @@ 2002-12-15 Matthias Clasen + * configure.in: Set TRIO_LIBS when building with trio. + + * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. + + * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. + * glib/trio/glibtrio.h: New file, redefining all trio symbols to fall into the _G/_g_ private glib namespace. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0c18506..7d8fdcb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,11 @@ 2002-12-15 Matthias Clasen + * configure.in: Set TRIO_LIBS when building with trio. + + * glib-2.0.pc.in (Libs): Add @TRIO_LIBS@. + + * glib/trio/Makefile.am (libtrio_la_LIBADD): Use @TRIO_LIBS@. + * glib/trio/glibtrio.h: New file, redefining all trio symbols to fall into the _G/_g_ private glib namespace. diff --git a/configure.in b/configure.in index aefdc75..3ae989f 100644 --- a/configure.in +++ b/configure.in @@ -721,7 +721,7 @@ if test "x$enable_trio" = "xno" && test "x$need_trio" = "xyes" ; then AC_MSG_ERROR([ *** Your C library's printf doesn't appear to have the features that -*** GLib needs, but you specified --enable-trio=no.]) +*** GLib needs, but you specified --enable-included-printf=no.]) fi enable_trio=$need_trio @@ -734,7 +734,9 @@ else AC_DEFINE(HAVE_VASPRINTF,1) AC_DEFINE(HAVE_C99_VSNPRINTF,1) AC_DEFINE(HAVE_UNIX98_PRINTF,1) + TRIO_LIBS=-lm fi +AC_SUBST(TRIO_LIBS) # Check if bcopy can be used for overlapping copies, if memmove isn't found. # The check is borrowed from the PERL Configure script. diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in index 6120741..16aa72a 100644 --- a/glib-2.0.pc.in +++ b/glib-2.0.pc.in @@ -10,5 +10,6 @@ glib_mkenums=glib-mkenums Name: GLib Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ +Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ @TRIO_LIBS@ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include + diff --git a/glib/trio/Makefile.am b/glib/trio/Makefile.am index 24b718a..7907c64 100644 --- a/glib/trio/Makefile.am +++ b/glib/trio/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libtrio.la -libtrio_la_LIBADD = -lm +libtrio_la_LIBADD = @TRIO_LIBS@ libtrio_la_SOURCES = \ trio.c \ -- 2.7.4