Commit c95ce4b3 authored by Matthias Clasen's avatar Matthias Clasen

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@.
parent 7baf6850
2002-12-15 Matthias Clasen <maclas@gmx.de> 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 * glib/trio/glibtrio.h: New file, redefining all trio symbols to
fall into the _G/_g_ private glib namespace. fall into the _G/_g_ private glib namespace.
......
2002-12-15 Matthias Clasen <maclas@gmx.de> 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 * glib/trio/glibtrio.h: New file, redefining all trio symbols to
fall into the _G/_g_ private glib namespace. fall into the _G/_g_ private glib namespace.
......
2002-12-15 Matthias Clasen <maclas@gmx.de> 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 * glib/trio/glibtrio.h: New file, redefining all trio symbols to
fall into the _G/_g_ private glib namespace. fall into the _G/_g_ private glib namespace.
......
2002-12-15 Matthias Clasen <maclas@gmx.de> 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 * glib/trio/glibtrio.h: New file, redefining all trio symbols to
fall into the _G/_g_ private glib namespace. fall into the _G/_g_ private glib namespace.
......
2002-12-15 Matthias Clasen <maclas@gmx.de> 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 * glib/trio/glibtrio.h: New file, redefining all trio symbols to
fall into the _G/_g_ private glib namespace. fall into the _G/_g_ private glib namespace.
......
2002-12-15 Matthias Clasen <maclas@gmx.de> 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 * glib/trio/glibtrio.h: New file, redefining all trio symbols to
fall into the _G/_g_ private glib namespace. fall into the _G/_g_ private glib namespace.
......
2002-12-15 Matthias Clasen <maclas@gmx.de> 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 * glib/trio/glibtrio.h: New file, redefining all trio symbols to
fall into the _G/_g_ private glib namespace. fall into the _G/_g_ private glib namespace.
......
...@@ -721,7 +721,7 @@ if test "x$enable_trio" = "xno" && ...@@ -721,7 +721,7 @@ if test "x$enable_trio" = "xno" &&
test "x$need_trio" = "xyes" ; then test "x$need_trio" = "xyes" ; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Your C library's printf doesn't appear to have the features that *** 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 fi
enable_trio=$need_trio enable_trio=$need_trio
...@@ -734,7 +734,9 @@ else ...@@ -734,7 +734,9 @@ else
AC_DEFINE(HAVE_VASPRINTF,1) AC_DEFINE(HAVE_VASPRINTF,1)
AC_DEFINE(HAVE_C99_VSNPRINTF,1) AC_DEFINE(HAVE_C99_VSNPRINTF,1)
AC_DEFINE(HAVE_UNIX98_PRINTF,1) AC_DEFINE(HAVE_UNIX98_PRINTF,1)
TRIO_LIBS=-lm
fi fi
AC_SUBST(TRIO_LIBS)
# Check if bcopy can be used for overlapping copies, if memmove isn't found. # Check if bcopy can be used for overlapping copies, if memmove isn't found.
# The check is borrowed from the PERL Configure script. # The check is borrowed from the PERL Configure script.
......
...@@ -10,5 +10,6 @@ glib_mkenums=glib-mkenums ...@@ -10,5 +10,6 @@ glib_mkenums=glib-mkenums
Name: GLib Name: GLib
Description: C Utility Library Description: C Utility Library
Version: @VERSION@ 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 Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
noinst_LTLIBRARIES = libtrio.la noinst_LTLIBRARIES = libtrio.la
libtrio_la_LIBADD = -lm libtrio_la_LIBADD = @TRIO_LIBS@
libtrio_la_SOURCES = \ libtrio_la_SOURCES = \
trio.c \ trio.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment