mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-10-31 00:12:19 +01:00 
			
		
		
		
	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@.
This commit is contained in:
		| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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. | ||||
|   | ||||
| @@ -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  | ||||
|  | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|  | ||||
| noinst_LTLIBRARIES = libtrio.la | ||||
|  | ||||
| libtrio_la_LIBADD = -lm | ||||
| libtrio_la_LIBADD = @TRIO_LIBS@ | ||||
|  | ||||
| libtrio_la_SOURCES = 	\ | ||||
| 	trio.c		\ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user