luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-08 11:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set TRIO_LIBS when building with trio.

Browse Source 
* 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@.
This commit is contained in:
Matthias Clasen 2002-12-15 00:42:37 +00:00
parent 7baf68502f
commit c95ce4b301
10 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
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.

6
ChangeLog.pre-2-10
View File

@ -1,5 +1,11 @@
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.

6
ChangeLog.pre-2-12
View File

@ -1,5 +1,11 @@
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.

6
ChangeLog.pre-2-2
View File

@ -1,5 +1,11 @@
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.

6
ChangeLog.pre-2-4
View File

@ -1,5 +1,11 @@
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.

6
ChangeLog.pre-2-6
View File

@ -1,5 +1,11 @@
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.

6
ChangeLog.pre-2-8
View File

@ -1,5 +1,11 @@
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.

4
configure.in
View File

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

3
glib-2.0.pc.in
View File

@ -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
glib/trio/Makefile.am
View File

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