"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "m4/glib-2.0.m4" between
libextractor-1.8.tar.gz and libextractor-1.9.tar.gz

About: GNU libextractor is a library used to extract meta-data from files of arbitrary type.

glib-2.0.m4  (libextractor-1.8):glib-2.0.m4  (libextractor-1.9)
# Configure paths for GLIB # Configure paths for GLIB
# Owen Taylor 1997-2001 # Owen Taylor 1997-2001
# Increment this whenever this file is changed.
#serial 1
dnl AM_PATH_GLIB_2_0([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, gobject or dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
dnl gthread is specified in MODULES, pass to pkg-config dnl gthread, or gio is specified in MODULES, pass to pkg-config
dnl dnl
AC_DEFUN([AM_PATH_GLIB_2_0], AC_DEFUN([AM_PATH_GLIB_2_0],
[dnl [dnl
dnl Get the cflags and libraries from pkg-config dnl Get the cflags and libraries from pkg-config
dnl dnl
AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
, enable_glibtest=yes) , enable_glibtest=yes)
pkg_config_args=glib-2.0 pkg_config_args=glib-2.0
for module in . $4 for module in . $4
do do
case "$module" in case "$module" in
gmodule) gmodule)
pkg_config_args="$pkg_config_args gmodule-2.0" pkg_config_args="$pkg_config_args gmodule-2.0"
;; ;;
gmodule-no-export)
pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
;;
gobject) gobject)
pkg_config_args="$pkg_config_args gobject-2.0" pkg_config_args="$pkg_config_args gobject-2.0"
;; ;;
gthread) gthread)
pkg_config_args="$pkg_config_args gthread-2.0" pkg_config_args="$pkg_config_args gthread-2.0"
;; ;;
gio*)
pkg_config_args="$pkg_config_args $module-2.0"
;;
esac esac
done done
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) PKG_PROG_PKG_CONFIG([0.16])
no_glib="" no_glib=""
if test x$PKG_CONFIG != xno ; then if test "x$PKG_CONFIG" = x ; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
:
else
echo *** pkg-config too old; version 0.7 or better required.
no_glib=yes
PKG_CONFIG=no
fi
else
no_glib=yes no_glib=yes
PKG_CONFIG=no
fi fi
min_glib_version=ifelse([$1], ,2.0.0,$1) min_glib_version=ifelse([$1], ,2.0.0,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
if test x$PKG_CONFIG != xno ; then if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs ## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
enable_glibtest=no enable_glibtest=no
skipping to change at line 68 skipping to change at line 70
: :
else else
no_glib=yes no_glib=yes
fi fi
fi fi
if test x"$no_glib" = x ; then if test x"$no_glib" = x ; then
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2. 0`
GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
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
skipping to change at line 93 skipping to change at line 96
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 pkg-config to some extent) dnl checks the results of pkg-config to some extent)
dnl dnl
rm -f conf.glibtest rm -f conf.glibtest
AC_TRY_RUN([ AC_TRY_RUN([
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
int int
main () main (void)
{ {
int major, minor, micro; unsigned int major, minor, micro;
char *tmp_version;
system ("touch conf.glibtest"); fclose (fopen ("conf.glibtest", "w"));
/* HP/UX 9 (%@#!) writes to sscanf strings */ if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
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"); printf("%s, bad version string\n", "$min_glib_version");
exit(1); exit(1);
} }
if ((glib_major_version != $glib_config_major_version) || if ((glib_major_version != $glib_config_major_version) ||
(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*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GL IB (%d.%d.%d)\n", printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GL IB (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_confi g_micro_version, $glib_config_major_version, $glib_config_minor_version, $glib_confi g_micro_version,
skipping to change at line 141 skipping to change at line 141
else else
{ {
if ((glib_major_version > major) || if ((glib_major_version > major) ||
((glib_major_version == major) && (glib_minor_version > minor)) || ((glib_major_version == major) && (glib_minor_version > minor)) ||
((glib_major_version == major) && (glib_minor_version == minor) && (glib _micro_version >= micro))) ((glib_major_version == major) && (glib_minor_version == minor) && (glib _micro_version >= micro)))
{ {
return 0; return 0;
} }
else else
{ {
printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
glib_major_version, glib_minor_version, glib_micro_version); glib_major_version, glib_minor_version, glib_micro_version);
printf("*** You need a version of GLIB newer than %d.%d.%d. The latest v ersion of\n", printf("*** You need a version of GLIB newer than %u.%u.%u. The latest v ersion of\n",
major, minor, micro); major, minor, micro);
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, th is error\n"); printf("*** If you have already installed a sufficiently new version, th is error\n");
printf("*** probably means that the wrong copy of the pkg-config shell s cript is\n"); printf("*** probably means that the wrong copy of the pkg-config shell s cript is\n");
printf("*** being found. The easiest way to fix this is to remove the ol d version\n"); printf("*** being found. The easiest way to fix this is to remove the ol d version\n");
printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\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("*** correct copy of pkg-config. (In this case, you will have to\ n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /et c/ld.so.conf\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /et c/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");
skipping to change at line 204 skipping to change at line 204
echo "*** exact error that occured. This usually means GLIB is incorre ctly installed."]) echo "*** exact error that occured. This usually means GLIB is incorre ctly installed."])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
fi fi
GLIB_CFLAGS="" GLIB_CFLAGS=""
GLIB_LIBS="" GLIB_LIBS=""
GLIB_GENMARSHAL="" GLIB_GENMARSHAL=""
GOBJECT_QUERY="" GOBJECT_QUERY=""
GLIB_MKENUMS="" GLIB_MKENUMS=""
GLIB_COMPILE_RESOURCES=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_GENMARSHAL) AC_SUBST(GLIB_GENMARSHAL)
AC_SUBST(GOBJECT_QUERY) AC_SUBST(GOBJECT_QUERY)
AC_SUBST(GLIB_MKENUMS) AC_SUBST(GLIB_MKENUMS)
AC_SUBST(GLIB_COMPILE_RESOURCES)
rm -f conf.glibtest rm -f conf.glibtest
]) ])
 End of changes. 16 change blocks. 
21 lines changed or deleted 23 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)