Commit 20f3f9d9 authored by Matthias Clasen's avatar Matthias Clasen

One forgotten rename

parent 4fe044b7
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
installed_m4= gtk-2.0.m4 installed_m4= gtk-3.0.m4
EXTRA_DIST += $(installed_m4) EXTRA_DIST += $(installed_m4)
......
# Configure paths for GTK+ # Configure paths for GTK+
# Owen Taylor 1997-2001 # Owen Taylor 1997-2001
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config dnl pass to pkg-config
dnl dnl
AC_DEFUN([AM_PATH_GTK_2_0], AC_DEFUN([AM_PATH_GTK_3_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(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
, enable_gtktest=yes) , enable_gtktest=yes)
pkg_config_args=gtk+-2.0 pkg_config_args=gtk+-3.0
for module in . $4 for module in . $4
do do
case "$module" in case "$module" in
gthread) gthread)
pkg_config_args="$pkg_config_args gthread-2.0" pkg_config_args="$pkg_config_args gthread-2.0"
;; ;;
esac esac
...@@ -38,7 +38,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run ...@@ -38,7 +38,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run
no_gtk=yes no_gtk=yes
fi fi
min_gtk_version=ifelse([$1], ,2.0.0,$1) min_gtk_version=ifelse([$1], ,3.0.0,$1)
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
if test x$PKG_CONFIG != xno ; then if test x$PKG_CONFIG != xno ; then
...@@ -58,11 +58,11 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run ...@@ -58,11 +58,11 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run
if test x"$no_gtk" = x ; then if test x"$no_gtk" = x ; then
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
...@@ -98,7 +98,7 @@ main () ...@@ -98,7 +98,7 @@ main ()
(gtk_minor_version != $gtk_config_minor_version) || (gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version)) (gtk_micro_version != $gtk_config_micro_version))
{ {
printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version); gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n"); printf ("*** was found! If pkg-config was correct, then it is best\n");
...@@ -152,7 +152,7 @@ main () ...@@ -152,7 +152,7 @@ main ()
fi fi
if test "x$no_gtk" = x ; then if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
if test "$PKG_CONFIG" = "no" ; then if test "$PKG_CONFIG" = "no" ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment