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@.

diff --git a/ChangeLog b/ChangeLog
index 0c1850600281b7544f6e4886dd5d4b7f7a7774b9..7d8fdcb5fd96641c0b60e33e94643b8865c14ffe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-12-15  Matthias Clasen  <maclas@gmx.de>
 
+       * 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 0c1850600281b7544f6e4886dd5d4b7f7a7774b9..7d8fdcb5fd96641c0b60e33e94643b8865c14ffe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2002-12-15  Matthias Clasen  <maclas@gmx.de>
 
+       * 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 0c1850600281b7544f6e4886dd5d4b7f7a7774b9..7d8fdcb5fd96641c0b60e33e94643b8865c14ffe 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,11 @@
 2002-12-15  Matthias Clasen  <maclas@gmx.de>
 
+       * 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 0c1850600281b7544f6e4886dd5d4b7f7a7774b9..7d8fdcb5fd96641c0b60e33e94643b8865c14ffe 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,11 @@
 2002-12-15  Matthias Clasen  <maclas@gmx.de>
 
+       * 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 0c1850600281b7544f6e4886dd5d4b7f7a7774b9..7d8fdcb5fd96641c0b60e33e94643b8865c14ffe 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,11 @@
 2002-12-15  Matthias Clasen  <maclas@gmx.de>
 
+       * 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 0c1850600281b7544f6e4886dd5d4b7f7a7774b9..7d8fdcb5fd96641c0b60e33e94643b8865c14ffe 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
 2002-12-15  Matthias Clasen  <maclas@gmx.de>
 
+       * 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 0c1850600281b7544f6e4886dd5d4b7f7a7774b9..7d8fdcb5fd96641c0b60e33e94643b8865c14ffe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2002-12-15  Matthias Clasen  <maclas@gmx.de>
 
+       * 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 aefdc7596396a623418d61f0b5a9fe525150caf6..3ae989fc6cdfb7ed3e2b29d5f9bcad21b7afc7e4 100644 (file)
--- 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 612074110982de59ed762c0d7452d5bc7850b68f..16aa72a99e9ff039293ac824da47f4a308154e18 100644 (file)
--- 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 24b718afab8425d5a10fd758c666836268042b6f..7907c64836e61dbd75d09c3e3e8dd69dca1eaa3a 100644 (file)
--- 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          \