+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
+Tue Apr 3 12:38:16 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib-config-2.0.in: Exit with an error message that you
+ should use pkg-config instead.
+
+ * configure.in (PACKAGE): Require pkg-config.
+
+ * tests/Makefile.am (EXTRA_DIST): Add utf8.txt.
+
+ * configure.in (GLIB_MICRO_VERSION): Up MICRO to 3,
+ leave interface/binary at 0.
+
Tue Apr 3 13:46:22 2001 Tim Janik <timj@gtk.org>
* glist.[hc]: added g_list_nth_prev() which walks ->prev instead
#
GLIB_MAJOR_VERSION=1
GLIB_MINOR_VERSION=3
-GLIB_MICRO_VERSION=2
+GLIB_MICRO_VERSION=3
GLIB_INTERFACE_AGE=0
GLIB_BINARY_AGE=0
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
AM_PROG_CC_STDC
AC_PROG_INSTALL
+#
+# Find pkg-config
+#
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test x$PKG_CONFIG = xno ; then
+ AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net])
+fi
+
+if ! pkg-config --atleast-pkgconfig-version 0.5 ; then
+ AC_MSG_ERROR([*** pkg-config too old; version 0.5 or better required.])
+fi
+
if test "x$enable_debug" = "xyes"; then
if test x$cflags_set != xset ; then
case " $CFLAGS " in
# Configure paths for GLIB
-# Owen Taylor 97-11-3
+# Owen Taylor 1997-2001
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
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
-
+ pkg_config_args=glib-2.0
for module in . $4
do
case "$module" in
gmodule)
- glib_config_args="$glib_config_args gmodule"
+ pkg_config_args="$pkg_config_args gmodule-2.0"
;;
gobject)
- glib_config_args="$glib_config_args gobject"
+ pkg_config_args="$pkg_config_args gobject-2.0"
;;
gthread)
- glib_config_args="$glib_config_args gthread"
+ pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
done
- AC_PATH_PROG(GLIB_CONFIG_2_0, glib-config-2.0, no)
- min_glib_version=ifelse([$1], ,1.3.1,$1)
+ min_glib_version=ifelse([$1], ,1.3.3,$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 | \
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.5 ; then
+ :
+ else
+ echo *** pkg-config too old; version 0.5 or better required.
+ no_glib=yes
+ PKG_CONFIG=no
+ fi
+ fi
+
+ if test x"$no_glib" = x ; then
+ GLIB_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GLIB_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ glib_config_major_version=`$PKG_CONFIG glib-2.0 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- glib_config_minor_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
+ glib_config_minor_version=`$PKG_CONFIG glib-2.0 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- glib_config_micro_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
+ glib_config_micro_version=`$PKG_CONFIG glib-2.0 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_glibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
(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",
+ printf("\n*** 'pkg-config --modversion glib-2.0' 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 ("*** was found! If pkg-config 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");
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+ printf("*** to point to the correct configuration files\n");
}
else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) ||
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("*** probably means that the wrong copy of the pkg-config 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("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+ printf("*** correct copy of pkg-config. (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");
}
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."
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://pkgconfig.sourceforge.net"
else
if test -f conf.glibtest ; then
:
[ 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" ])
+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
#!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage()
-{
- cat <<EOF
-Usage: glib-config-2.0 [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--version]
- [--libs]
- [--cflags]
- [--help]
-Libraries:
- glib
- gmodule
- gobject
- gthread
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-lib_glib=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- if test $exec_prefix_set = no ; then
- exec_prefix=$optarg
- fi
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- exec_prefix_set=yes
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --version)
- echo @GLIB_VERSION@
- exit 0
- ;;
- --cflags)
- includes="-I@includedir@/glib-2.0"
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- glib)
- lib_glib=yes
- ;;
- gmodule)
- lib_gmodule=yes
- ;;
- gobject)
- lib_gobject=yes
- ;;
- gthread)
- lib_gthread=yes
- ;;
- --help | -h)
- usage 0 1>&2
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-if test "$echo_cflags" = "yes"; then
- cflags=""
- if test "$lib_gthread" = "yes"; then
- cflags="$cflags @G_THREAD_CFLAGS@"
- fi
- echo -I@libdir@/glib-2.0/include $includes $cflags
-fi
-if test "$echo_libs" = "yes"; then
- libsp=""
- libsa=""
- if test "$lib_glib" = "yes"; then
- libsp="$libsp -lglib-1.3"
- libsa="$libsa @ICONV_LIBS@ @INTLLIBS@"
- fi
- if test "$lib_gobject" = "yes"; then
- libsp="-lgobject-1.3 $libsp"
- fi
- if test "$lib_gthread" = "yes"; then
- libsp="-lgthread-1.3 $libsp"
- libsa="$libsa @G_THREAD_LIBS@"
- fi
- if test "$lib_gmodule" = "yes"; then
- libsp="@G_MODULE_LDFLAGS@ -lgmodule-1.3 $libsp"
- libsa="$libsa @G_MODULE_LIBS@"
- fi
- echo -L@libdir@ $libsp $libsa
-fi
+echo glib-config-2.0 is no longer supported. Please use pkg-config instead 2>&1
+exit 1
# Configure paths for GLIB
-# Owen Taylor 97-11-3
+# Owen Taylor 1997-2001
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
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
-
+ pkg_config_args=glib-2.0
for module in . $4
do
case "$module" in
gmodule)
- glib_config_args="$glib_config_args gmodule"
+ pkg_config_args="$pkg_config_args gmodule-2.0"
;;
gobject)
- glib_config_args="$glib_config_args gobject"
+ pkg_config_args="$pkg_config_args gobject-2.0"
;;
gthread)
- glib_config_args="$glib_config_args gthread"
+ pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
done
- AC_PATH_PROG(GLIB_CONFIG_2_0, glib-config-2.0, no)
- min_glib_version=ifelse([$1], ,1.3.1,$1)
+ min_glib_version=ifelse([$1], ,1.3.3,$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 | \
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.5 ; then
+ :
+ else
+ echo *** pkg-config too old; version 0.5 or better required.
+ no_glib=yes
+ PKG_CONFIG=no
+ fi
+ fi
+
+ if test x"$no_glib" = x ; then
+ GLIB_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GLIB_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ glib_config_major_version=`$PKG_CONFIG glib-2.0 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- glib_config_minor_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
+ glib_config_minor_version=`$PKG_CONFIG glib-2.0 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- glib_config_micro_version=`$GLIB_CONFIG_2_0 $glib_config_args --version | \
+ glib_config_micro_version=`$PKG_CONFIG glib-2.0 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_glibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
(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",
+ printf("\n*** 'pkg-config --modversion glib-2.0' 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 ("*** was found! If pkg-config 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");
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+ printf("*** to point to the correct configuration files\n");
}
else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) ||
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("*** probably means that the wrong copy of the pkg-config 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("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+ printf("*** correct copy of pkg-config. (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");
}
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."
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://pkgconfig.sourceforge.net"
else
if test -f conf.glibtest ; then
:
[ 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" ])
+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
EXTRA_DIST = \
$(test_scripts) \
makefile.msc.in \
- makefile.mingw.in
+ makefile.mingw.in \
+ utf8.txt
BUILT_EXTRA_DIST = \
makefile.mingw \
projects / platform / upstream / glib.git / commitdiff