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

Move glib-config to glib-config-2.0 move glib.m4 to glib-2.0.m4

Browse Source 
Fri Jul 14 12:22:49 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in Makefile.am glib-config.m4 glib.m4: Move
	glib-config to glib-config-2.0 move glib.m4 to
	glib-2.0.m4

	* Makefile.am gobject/Makefile.am gmodule/Makefile.am
	gthread/Makefile.am tests/Makefile.am: Change
	library names to libglib-1.3.la, etc, so that we
	can distinguish glib-1.2 and glib-2.0 on the linkline.

	* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
	Move include files into /usr/include/glib-2.0.

Thu Jul  6 18:54:49 2000  Owen Taylor  <otaylor@redhat.com>

	* docs/Makefile.am (EXTRA_DIST): Remove info files
	from the build.
This commit is contained in:
Owen Taylor 2000-07-14 19:22:54 +00:00 committed by Owen Taylor
parent f4e591eb7b
commit eb023508ad
19 changed files with 463 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

19
ChangeLog.pre-2-0
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

19
ChangeLog.pre-2-10
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

19
ChangeLog.pre-2-12
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

19
ChangeLog.pre-2-2
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

19
ChangeLog.pre-2-4
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

19
ChangeLog.pre-2-6
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

19
ChangeLog.pre-2-8
View File

@ -1,3 +1,22 @@
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* glib.def: Add g_error functions. * glib.def: Add g_error functions.

32
Makefile.am
View File

@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = 1.4
SUBDIRS = . gobject gmodule gthread docs tests SUBDIRS = . gobject gmodule gthread docs tests
bin_SCRIPTS=glib-config bin_SCRIPTS=glib-config-2.0
BUILT_SOURCES=glib-config BUILT_SOURCES=glib-config-2.0
glib-config: glib-config.in glib-config-2.0: glib-config-2.0.in
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
EXTRA_DIST = \ EXTRA_DIST = \
ChangeLog.pre-1-2 \ ChangeLog.pre-1-2 \
glib.m4 \ glib-2.0.m4 \
glib.spec.in \ glib.spec.in \
acglib.m4 \ acglib.m4 \
sanity_check \ sanity_check \
@ -33,9 +33,9 @@ EXTRA_DIST = \
glib.rc \ glib.rc \
glib.rc.in glib.rc.in
lib_LTLIBRARIES = libglib.la lib_LTLIBRARIES = libglib-1.3.la
libglib_la_SOURCES = \ libglib_1_3_la_SOURCES = \
garray.c \ garray.c \
gasyncqueue.c \ gasyncqueue.c \
gbacktrace.c \ gbacktrace.c \
@ -72,9 +72,14 @@ libglib_la_SOURCES = \
gunidecomp.c \ gunidecomp.c \
gutils.c gutils.c
include_HEADERS = glib.h glib-object.h gunicode.h gerror.h glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \
gerror.h \
glib.h \
glib-object.h \
gunicode.h
configexecincludedir = $(pkglibdir)/include configexecincludedir = $(libdir)/glib-2.0/include
#configexecinclude_DATA = glibconfig.h #configexecinclude_DATA = glibconfig.h
install-exec-local: glibconfig.h install-exec-local: glibconfig.h
@ -93,18 +98,17 @@ stamp-gc-h: config.status
CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
echo timestamp > stamp-gc-h echo timestamp > stamp-gc-h
libglib_la_LDFLAGS = \ libglib_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
-export-dynamic -export-dynamic
noinst_PROGRAMS = testglib testgdate testgdateparser noinst_PROGRAMS = testglib testgdate testgdateparser
testglib_LDADD = libglib.la testglib_LDADD = libglib-1.3.la
testgdate_LDADD = libglib.la testgdate_LDADD = libglib-1.3.la
testgdateparser_LDADD = libglib.la testgdateparser_LDADD = libglib-1.3.la
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4 m4data_DATA = glib-2.0.m4
glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

4
configure.in
View File

@ -1526,7 +1526,7 @@ esac
AC_OUTPUT([ AC_OUTPUT([
glib.spec glib.spec
Makefile Makefile
glib-config glib-config-2.0
gmodule/gmoduleconf.h gmodule/gmoduleconf.h
gmodule/Makefile gmodule/Makefile
gobject/Makefile gobject/Makefile
@ -1535,7 +1535,7 @@ docs/Makefile
docs/glib-config.1 docs/glib-config.1
tests/Makefile tests/Makefile
],[case "$CONFIG_FILES" in ],[case "$CONFIG_FILES" in
*glib-config*)chmod +x glib-config;; *glib-config-2.0*)chmod +x glib-config-2.0;;
esac esac
echo "" echo ""
echo " *** IMPORTANT *** " echo " *** IMPORTANT *** "

9
docs/Makefile.am
View File

@ -1,15 +1,8 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
info_TEXINFOS = glib.texi
man_MANS = glib-config.1 man_MANS = glib-config.1
EXTRA_DIST = glib-config.1.in \ EXTRA_DIST = glib-config.1.in
glib.html \
glib_toc.html
glib.html glib_toc.html:
(cd $(srcdir); texi2html glib.texi)
files: files:
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \

56
glib.m4 → glib-2.0.m4
View File

@ -1,13 +1,13 @@
# Configure paths for GLIB # Configure paths for GLIB
# Owen Taylor 97-11-3 # Owen Taylor 97-11-3
dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
dnl gthread is specified in MODULES, pass to glib-config dnl gthread is specified in MODULES, pass to glib-config
dnl dnl
AC_DEFUN(AM_PATH_GLIB, AC_DEFUN(AM_PATH_GLIB_2_0,
[dnl [dnl
dnl Get the cflags and libraries from the glib-config script dnl Get the cflags and libraries from the glib-config-2.0 script
dnl dnl
AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
glib_config_prefix="$withval", glib_config_prefix="") glib_config_prefix="$withval", glib_config_prefix="")
@ -18,14 +18,14 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru
if test x$glib_config_exec_prefix != x ; then if test x$glib_config_exec_prefix != x ; then
glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
if test x${GLIB_CONFIG+set} != xset ; then if test x${GLIB_CONFIG_2_0+set} != xset ; then
GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config GLIB_CONFIG_2_0=$glib_config_exec_prefix/bin/glib-config-2.0
fi fi
fi fi
if test x$glib_config_prefix != x ; then if test x$glib_config_prefix != x ; then
glib_config_args="$glib_config_args --prefix=$glib_config_prefix" glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
if test x${GLIB_CONFIG+set} != xset ; then if test x${GLIB_CONFIG_2_0+set} != xset ; then
GLIB_CONFIG=$glib_config_prefix/bin/glib-config GLIB_CONFIG_2_0=$glib_config_prefix/bin/glib-config-2.0
fi fi
fi fi
@ -44,20 +44,20 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru
esac esac
done done
AC_PATH_PROG(GLIB_CONFIG, glib-config, no) AC_PATH_PROG(GLIB_CONFIG_2_0, glib-config-2.0, no)
min_glib_version=ifelse([$1], ,0.99.7,$1) min_glib_version=ifelse([$1], ,1.3.1,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
no_glib="" no_glib=""
if test "$GLIB_CONFIG" = "no" ; then if test "$GLIB_CONFIG_2_0" = "no" ; then
no_glib=yes no_glib=yes
else else
GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` GLIB_CFLAGS=`$GLIB_CONFIG_2_0 $glib_config_args --cflags`
GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` GLIB_LIBS=`$GLIB_CONFIG_2_0 $glib_config_args --libs`
glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ glib_config_major_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ glib_config_minor_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ glib_config_micro_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_glibtest" = "xyes" ; then if test "x$enable_glibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
@ -66,7 +66,7 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru
LIBS="$GLIB_LIBS $LIBS" LIBS="$GLIB_LIBS $LIBS"
dnl dnl
dnl Now check if the installed GLIB is sufficiently new. (Also sanity dnl Now check if the installed GLIB is sufficiently new. (Also sanity
dnl checks the results of glib-config to some extent dnl checks the results of glib-config-2.0 to some extent
dnl dnl
rm -f conf.glibtest rm -f conf.glibtest
AC_TRY_RUN([ AC_TRY_RUN([
@ -93,16 +93,16 @@ main ()
(glib_minor_version != $glib_config_minor_version) || (glib_minor_version != $glib_config_minor_version) ||
(glib_micro_version != $glib_config_micro_version)) (glib_micro_version != $glib_config_micro_version))
{ {
printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", printf("\n*** 'glib-config-2.0 --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
glib_major_version, glib_minor_version, glib_micro_version); glib_major_version, glib_minor_version, glib_micro_version);
printf ("*** was found! If glib-config was correct, then it is best\n"); printf ("*** was found! If glib-config-2.0 was correct, then it is best\n");
printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n"); printf("*** required on your system.\n");
printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); printf("*** If glib-config-2.0 was wrong, set the environment variable GLIB_CONFIG_2_0\n");
printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); printf("*** to point to the correct copy of glib-config-2.0, and remove the file config.cache\n");
printf("*** before re-running configure\n"); printf("*** before re-running configure\n");
} }
else if ((glib_major_version != GLIB_MAJOR_VERSION) || else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
@ -131,10 +131,10 @@ main ()
printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
printf("***\n"); printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the glib-config shell script is\n"); printf("*** probably means that the wrong copy of the glib-config-2.0 shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); printf("*** of GLIB, but you can also set the GLIB_CONFIG_2_0 environment to point to the\n");
printf("*** correct copy of glib-config. (In this case, you will have to\n"); printf("*** correct copy of glib-config-2.0. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n"); printf("*** so that the correct libraries are found at run-time))\n");
} }
@ -151,11 +151,11 @@ main ()
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
if test "$GLIB_CONFIG" = "no" ; then if test "$GLIB_CONFIG_2_0" = "no" ; then
echo "*** The glib-config script installed by GLIB could not be found" echo "*** The glib-config-2.0 script installed by GLIB could not be found"
echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GLIB_CONFIG environment variable to the" echo "*** your path, or set the GLIB_CONFIG_2_0 environment variable to the"
echo "*** full path to glib-config." echo "*** full path to glib-config-2.0."
else else
if test -f conf.glibtest ; then if test -f conf.glibtest ; then
: :
@ -184,7 +184,7 @@ main ()
[ echo "*** The test program failed to compile or link. See the file config.log for the" [ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GLIB was incorrectly installed" echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
echo "*** or that you have moved GLIB since it was installed. In the latter case, you" echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) echo "*** may want to edit the glib-config-2.0 script: $GLIB_CONFIG_2_0" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi

14
glib-config.in → glib-config-2.0.in
View File

@ -57,9 +57,7 @@ while test $# -gt 0; do
exit 0 exit 0
;; ;;
--cflags) --cflags)
if test "@includedir@" != /usr/include ; then includes="-I@includedir@/glib-2.0"
includes="-I@includedir@"
fi
echo_cflags=yes echo_cflags=yes
;; ;;
--libs) --libs)
@ -95,23 +93,23 @@ if test "$echo_cflags" = "yes"; then
if test "$lib_gthread" = "yes"; then if test "$lib_gthread" = "yes"; then
cflags="$cflags @G_THREAD_CFLAGS@" cflags="$cflags @G_THREAD_CFLAGS@"
fi fi
echo -I@libdir@/glib/include $includes $cflags echo -I@libdir@/glib-2.0/include $includes $cflags
fi fi
if test "$echo_libs" = "yes"; then if test "$echo_libs" = "yes"; then
libsp="" libsp=""
libsa="" libsa=""
if test "$lib_glib" = "yes"; then if test "$lib_glib" = "yes"; then
libsp="$libsp -lglib" libsp="$libsp -lglib-1.3"
fi fi
if test "$lib_gobject" = "yes"; then if test "$lib_gobject" = "yes"; then
libsp="-lgobject $libsp" libsp="-lgobject-1.3 $libsp"
fi fi
if test "$lib_gthread" = "yes"; then if test "$lib_gthread" = "yes"; then
libsp="-lgthread $libsp" libsp="-lgthread-1.3 $libsp"
libsa="$libsa @G_THREAD_LIBS@" libsa="$libsa @G_THREAD_LIBS@"
fi fi
if test "$lib_gmodule" = "yes"; then if test "$lib_gmodule" = "yes"; then
libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp" libsp="@G_MODULE_LDFLAGS@ -lgmodule-1.3 $libsp"
libsa="$libsa @G_MODULE_LIBS@" libsa="$libsa @G_MODULE_LIBS@"
fi fi
echo -L@libdir@ $libsp $libsa echo -L@libdir@ $libsp $libsa

32
glib/Makefile.am
View File

@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = 1.4
SUBDIRS = . gobject gmodule gthread docs tests SUBDIRS = . gobject gmodule gthread docs tests
bin_SCRIPTS=glib-config bin_SCRIPTS=glib-config-2.0
BUILT_SOURCES=glib-config BUILT_SOURCES=glib-config-2.0
glib-config: glib-config.in glib-config-2.0: glib-config-2.0.in
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
EXTRA_DIST = \ EXTRA_DIST = \
ChangeLog.pre-1-2 \ ChangeLog.pre-1-2 \
glib.m4 \ glib-2.0.m4 \
glib.spec.in \ glib.spec.in \
acglib.m4 \ acglib.m4 \
sanity_check \ sanity_check \
@ -33,9 +33,9 @@ EXTRA_DIST = \
glib.rc \ glib.rc \
glib.rc.in glib.rc.in
lib_LTLIBRARIES = libglib.la lib_LTLIBRARIES = libglib-1.3.la
libglib_la_SOURCES = \ libglib_1_3_la_SOURCES = \
garray.c \ garray.c \
gasyncqueue.c \ gasyncqueue.c \
gbacktrace.c \ gbacktrace.c \
@ -72,9 +72,14 @@ libglib_la_SOURCES = \
gunidecomp.c \ gunidecomp.c \
gutils.c gutils.c
include_HEADERS = glib.h glib-object.h gunicode.h gerror.h glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \
gerror.h \
glib.h \
glib-object.h \
gunicode.h
configexecincludedir = $(pkglibdir)/include configexecincludedir = $(libdir)/glib-2.0/include
#configexecinclude_DATA = glibconfig.h #configexecinclude_DATA = glibconfig.h
install-exec-local: glibconfig.h install-exec-local: glibconfig.h
@ -93,18 +98,17 @@ stamp-gc-h: config.status
CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
echo timestamp > stamp-gc-h echo timestamp > stamp-gc-h
libglib_la_LDFLAGS = \ libglib_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
-export-dynamic -export-dynamic
noinst_PROGRAMS = testglib testgdate testgdateparser noinst_PROGRAMS = testglib testgdate testgdateparser
testglib_LDADD = libglib.la testglib_LDADD = libglib-1.3.la
testgdate_LDADD = libglib.la testgdate_LDADD = libglib-1.3.la
testgdateparser_LDADD = libglib.la testgdateparser_LDADD = libglib-1.3.la
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4 m4data_DATA = glib-2.0.m4
glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

20
gmodule/Makefile.am
View File

@ -20,23 +20,23 @@ EXTRA_DIST = \
BUILT_SOURCES = gmoduleconf.h BUILT_SOURCES = gmoduleconf.h
gmoduleconf.h: gmoduleconf.h.in gmoduleconf.h: gmoduleconf.h.in
include_HEADERS = \ glibincludedir=$(includedir)/glib-2.0
glibinclude_HEADERS = \
gmodule.h gmodule.h
libglib = $(top_builddir)/libglib.la # -lglib libglib = $(top_builddir)/libglib-1.3.la # -lglib
top_builddir_full=`cd \$(top_builddir); pwd` top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la
libgmodule_la_SOURCES = gmodule.c libgmodule_1_3_la_SOURCES = gmodule.c
libgmodule_la_LDFLAGS = \ libgmodule_1_3_la_LDFLAGS = \
@G_MODULE_LDFLAGS@ \ @G_MODULE_LDFLAGS@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
-export-dynamic -export-dynamic
libgmodule_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ # $(libglib) libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ # $(libglib)
# we should really depend on $(libglib) for libgmodule.la, but libtool has a # we should really depend on $(libglib) for libgmodule.la, but libtool has a
# problem with this ;( # problem with this ;(
@ -50,7 +50,7 @@ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_
noinst_PROGRAMS = testgmodule noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ testgmodule_LDADD = libgmodule-1.3.la $(libglib) @G_MODULE_LIBS@
gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in
cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@ -65,10 +65,10 @@ files:
echo $$p; \ echo $$p; \
done done
install-libLTLIBRARIES: libgmodule.la install-libLTLIBRARIES: libgmodule-1.3.la
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir) $(mkinstalldirs) $(DESTDIR)$(libdir)
@list='libgmodule.la'; for p in $$list; do \ @list='libgmodule-1.3.la'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \

13
gobject/Makefile.am
View File

@ -8,19 +8,18 @@ SUBDIRS =
INCLUDES = -I$(top_srcdir) -I$(top_builddir) @GLIB_DEBUG_FLAGS@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) @GLIB_DEBUG_FLAGS@
# libraries to compile and install # libraries to compile and install
lib_LTLIBRARIES = libgobject.la lib_LTLIBRARIES = libgobject-1.3.la
# provide g_logv() domain # provide g_logv() domain
DEFS += -DG_LOG_DOMAIN=g_log_domain_gobject DEFS += -DG_LOG_DOMAIN=g_log_domain_gobject
# libtool stuff: set version and export symbols for resolving # libtool stuff: set version and export symbols for resolving
libgobjectincludedir = $(includedir)/gobject libgobjectincludedir = $(includedir)/glib-2.0/gobject
libgobject_la_LDFLAGS = @STRIP_BEGIN@ \ libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
-export-dynamic \ -export-dynamic \
@STRIP_END@ @STRIP_END@
libgobject_la_LIBADD = # $(libglib) libgobject_1_3_la_LIBADD = # $(libglib)
# #
# setup source file variables # setup source file variables
@ -62,7 +61,7 @@ gobject_extra_sources = @STRIP_BEGIN@ \
# #
gobject_h_sources = $(gobject_private_h_sources) $(gobject_public_h_sources) # $(gobject_built_public_sources) gobject_h_sources = $(gobject_private_h_sources) $(gobject_public_h_sources) # $(gobject_built_public_sources)
libgobjectinclude_HEADERS = $(gobject_public_h_sources) # $(gobject_built_public_sources) libgobjectinclude_HEADERS = $(gobject_public_h_sources) # $(gobject_built_public_sources)
libgobject_la_SOURCES = $(gobject_c_sources) libgobject_1_3_la_SOURCES = $(gobject_c_sources)
MAINTAINERCLEANFILES += MAINTAINERCLEANFILES +=
# $(gobject_built_public_sources) $(gobject_built_sources) # $(gobject_built_public_sources) $(gobject_built_sources)
EXTRA_HEADERS += EXTRA_HEADERS +=
@ -77,7 +76,7 @@ bin_PROGRAMS = gobject-query
# source files # source files
gobject_query_SOURCES = gobject-query.c gobject_query_SOURCES = gobject-query.c
# link programs against libgobject # link programs against libgobject
progs_LDADD = ../libglib.la libgobject.la progs_LDADD = ../libglib-1.3.la libgobject-1.3.la
gobject_query_LDADD = $(progs_LDADD) gobject_query_LDADD = $(progs_LDADD)
# #

9
gthread/Makefile.am
View File

@ -17,15 +17,14 @@ libglib = $(top_builddir)/libglib.la # -lglib
top_builddir_full=`cd \$(top_builddir); pwd` top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgthread.la lib_LTLIBRARIES = libgthread-1.3.la
libgthread_la_SOURCES = gthread-impl.c libgthread_1_3_la_SOURCES = gthread-impl.c
libgthread_la_LDFLAGS = \ libgthread_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
-export-dynamic -export-dynamic
libgthread_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status

199
m4macros/glib-2.0.m4 Normal file
View File

@ -0,0 +1,199 @@
# Configure paths for GLIB
# Owen Taylor 97-11-3
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
dnl gthread is specified in MODULES, pass to glib-config
dnl
AC_DEFUN(AM_PATH_GLIB_2_0,
[dnl
dnl Get the cflags and libraries from the glib-config-2.0 script
dnl
AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
glib_config_prefix="$withval", glib_config_prefix="")
AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
, enable_glibtest=yes)
if test x$glib_config_exec_prefix != x ; then
glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
if test x${GLIB_CONFIG_2_0+set} != xset ; then
GLIB_CONFIG_2_0=$glib_config_exec_prefix/bin/glib-config-2.0
fi
fi
if test x$glib_config_prefix != x ; then
glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
if test x${GLIB_CONFIG_2_0+set} != xset ; then
GLIB_CONFIG_2_0=$glib_config_prefix/bin/glib-config-2.0
fi
fi
for module in . $4
do
case "$module" in
gmodule)
glib_config_args="$glib_config_args gmodule"
;;
gobject)
glib_config_args="$glib_config_args gobject"
;;
gthread)
glib_config_args="$glib_config_args gthread"
;;
esac
done
AC_PATH_PROG(GLIB_CONFIG_2_0, glib-config-2.0, no)
min_glib_version=ifelse([$1], ,1.3.1,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
no_glib=""
if test "$GLIB_CONFIG_2_0" = "no" ; then
no_glib=yes
else
GLIB_CFLAGS=`$GLIB_CONFIG_2_0 $glib_config_args --cflags`
GLIB_LIBS=`$GLIB_CONFIG_2_0 $glib_config_args --libs`
glib_config_major_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
glib_config_minor_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
glib_config_micro_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_glibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$GLIB_LIBS $LIBS"
dnl
dnl Now check if the installed GLIB is sufficiently new. (Also sanity
dnl checks the results of glib-config-2.0 to some extent
dnl
rm -f conf.glibtest
AC_TRY_RUN([
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.glibtest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_glib_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_glib_version");
exit(1);
}
if ((glib_major_version != $glib_config_major_version) ||
(glib_minor_version != $glib_config_minor_version) ||
(glib_micro_version != $glib_config_micro_version))
{
printf("\n*** 'glib-config-2.0 --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
printf ("*** was found! If glib-config-2.0 was correct, then it is best\n");
printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If glib-config-2.0 was wrong, set the environment variable GLIB_CONFIG_2_0\n");
printf("*** to point to the correct copy of glib-config-2.0, and remove the file config.cache\n");
printf("*** before re-running configure\n");
}
else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) ||
(glib_micro_version != GLIB_MICRO_VERSION))
{
printf("*** GLIB header files (version %d.%d.%d) do not match\n",
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
glib_major_version, glib_minor_version, glib_micro_version);
}
else
{
if ((glib_major_version > major) ||
((glib_major_version == major) && (glib_minor_version > minor)) ||
((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
glib_major_version, glib_minor_version, glib_micro_version);
printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the glib-config-2.0 shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GLIB, but you can also set the GLIB_CONFIG_2_0 environment to point to the\n");
printf("*** correct copy of glib-config-2.0. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_glib" = x ; then
AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GLIB_CONFIG_2_0" = "no" ; then
echo "*** The glib-config-2.0 script installed by GLIB could not be found"
echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GLIB_CONFIG_2_0 environment variable to the"
echo "*** full path to glib-config-2.0."
else
if test -f conf.glibtest ; then
:
else
echo "*** Could not run GLIB test program, checking why..."
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([
#include <glib.h>
#include <stdio.h>
], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
echo "***"
echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
echo "*** came with the system with the command"
echo "***"
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
echo "*** may want to edit the glib-config-2.0 script: $GLIB_CONFIG_2_0" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GLIB_CFLAGS=""
GLIB_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
rm -f conf.glibtest
])

37
tests/Makefile.am
View File

@ -27,24 +27,25 @@ TESTS = \
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
array_test_LDADD = $(top_builddir)/libglib.la progs_LDADD = $(top_builddir)/libglib-1.3.la
date_test_LDADD = $(top_builddir)/libglib.la thread_LDADD = $(progs_LDADD) $(top_builddir)/gthread/libgthread-1.3.la @G_THREAD_LIBS@
dirname_test_LDADD = $(top_builddir)/libglib.la
hash_test_LDADD = $(top_builddir)/libglib.la array_test_LDADD = $(progs_LDADD)
list_test_LDADD = $(top_builddir)/libglib.la date_test_LDADD = $(progs_LDADD)
node_test_LDADD = $(top_builddir)/libglib.la dirname_test_LDADD = $(progs_LDADD)
queue_test_LDADD = $(top_builddir)/libglib.la hash_test_LDADD = $(progs_LDADD)
rand_test_LDADD = $(top_builddir)/libglib.la list_test_LDADD = $(progs_LDADD)
relation_test_LDADD = $(top_builddir)/libglib.la node_test_LDADD = $(progs_LDADD)
slist_test_LDADD = $(top_builddir)/libglib.la queue_test_LDADD = $(progs_LDADD)
strfunc_test_LDADD = $(top_builddir)/libglib.la rand_test_LDADD = $(progs_LDADD)
string_test_LDADD = $(top_builddir)/libglib.la relation_test_LDADD = $(progs_LDADD)
thread_test_LDADD = $(top_builddir)/libglib.la \ slist_test_LDADD = $(progs_LDADD)
$(top_builddir)/gthread/libgthread.la @G_THREAD_LIBS@ strfunc_test_LDADD = $(progs_LDADD)
threadpool_test_LDADD = $(top_builddir)/libglib.la \ string_test_LDADD = $(progs_LDADD)
$(top_builddir)/gthread/libgthread.la @G_THREAD_LIBS@ thread_test_LDADD = $(thread_LDADD)
tree_test_LDADD = $(top_builddir)/libglib.la threadpool_test_LDADD = $(thread_LDADD)
type_test_LDADD = $(top_builddir)/libglib.la tree_test_LDADD = $(progs_LDADD)
type_test_LDADD = $(progs_LDADD)
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status