Replace AM_PATH_GTK_N_0() macros with use of PKG_CHECK_MODULES()
There is no reason not to use pkg-config nowadays and this allows to get rid of some third-party m4 files, which is always nice, and avoids warnings about GTK 3 and 4 macros being obsolete when regenerating configure with autoconf 2.71.
This commit is contained in:
Vadim Zeitlin
parent
45ab9f5646
commit
04f7e0664b
7 changed files with 851 additions and 1685 deletions
3
aclocal.m4
vendored
3
aclocal.m4
vendored
|
|
@ -20,9 +20,6 @@ m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
|
||||||
m4_include([build/aclocal/ax_subdirs_configure.m4])
|
m4_include([build/aclocal/ax_subdirs_configure.m4])
|
||||||
m4_include([build/aclocal/bakefile-lang.m4])
|
m4_include([build/aclocal/bakefile-lang.m4])
|
||||||
m4_include([build/aclocal/bakefile.m4])
|
m4_include([build/aclocal/bakefile.m4])
|
||||||
m4_include([build/aclocal/gtk-2.0.m4])
|
|
||||||
m4_include([build/aclocal/gtk-3.0.m4])
|
|
||||||
m4_include([build/aclocal/gtk-4.0.m4])
|
|
||||||
m4_include([build/aclocal/pkg.m4])
|
m4_include([build/aclocal/pkg.m4])
|
||||||
m4_include([build/aclocal/sdl.m4])
|
m4_include([build/aclocal/sdl.m4])
|
||||||
m4_include([build/aclocal/visibility.m4])
|
m4_include([build/aclocal/visibility.m4])
|
||||||
|
|
|
||||||
|
|
@ -1,187 +0,0 @@
|
||||||
# Configure paths for GTK+
|
|
||||||
# Owen Taylor 1997-2001
|
|
||||||
|
|
||||||
dnl AM_PATH_GTK_2_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 pass to pkg-config
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_GTK_2_0],
|
|
||||||
[dnl
|
|
||||||
dnl Get the cflags and libraries from pkg-config
|
|
||||||
dnl
|
|
||||||
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
|
|
||||||
, enable_gtktest=yes)
|
|
||||||
|
|
||||||
pkg_config_args=gtk+-2.0
|
|
||||||
for module in . $4
|
|
||||||
do
|
|
||||||
case "$module" in
|
|
||||||
gthread)
|
|
||||||
pkg_config_args="$pkg_config_args gthread-2.0"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
no_gtk=""
|
|
||||||
|
|
||||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
PKG_PROG_PKG_CONFIG([0.7])
|
|
||||||
|
|
||||||
min_gtk_version=ifelse([$1], ,2.0.0,$1)
|
|
||||||
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
|
|
||||||
|
|
||||||
if test x$PKG_CONFIG != xno ; then
|
|
||||||
## don't try to run the test against uninstalled libtool libs
|
|
||||||
if $PKG_CONFIG --uninstalled $pkg_config_args; then
|
|
||||||
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
|
|
||||||
enable_gtktest=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"$no_gtk" = x ; then
|
|
||||||
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
|
|
||||||
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
|
|
||||||
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
||||||
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
||||||
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
||||||
if test "x$enable_gtktest" = "xyes" ; then
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$GTK_LIBS $LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
|
|
||||||
dnl checks the results of pkg-config to some extent)
|
|
||||||
dnl
|
|
||||||
rm -f conf.gtktest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
int major, minor, micro;
|
|
||||||
char *tmp_version;
|
|
||||||
|
|
||||||
fclose (fopen ("conf.gtktest", "w"));
|
|
||||||
|
|
||||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
||||||
tmp_version = g_strdup("$min_gtk_version");
|
|
||||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
||||||
printf("%s, bad version string\n", "$min_gtk_version");
|
|
||||||
g_free(tmp_version);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
g_free(tmp_version);
|
|
||||||
|
|
||||||
if ((gtk_major_version != $gtk_config_major_version) ||
|
|
||||||
(gtk_minor_version != $gtk_config_minor_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",
|
|
||||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_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 ("*** to remove the old version of GTK+. 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 pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
|
|
||||||
printf("*** to point to the correct configuration files\n");
|
|
||||||
}
|
|
||||||
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
|
||||||
(gtk_minor_version != GTK_MINOR_VERSION) ||
|
|
||||||
(gtk_micro_version != GTK_MICRO_VERSION))
|
|
||||||
{
|
|
||||||
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
|
||||||
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
|
||||||
printf("*** library (version %d.%d.%d)\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((gtk_major_version > major) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
|
|
||||||
major, minor, micro);
|
|
||||||
printf("*** GTK+ 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 pkg-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of GTK+, 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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_gtk" = x ; then
|
|
||||||
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
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.gtktest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run GTK+ test program, checking why..."
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$LIBS $GTK_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
|
|
||||||
echo "*** version of GTK+. If it is not finding GTK+, 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 "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
GTK_CFLAGS=""
|
|
||||||
GTK_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
AC_SUBST(GTK_CFLAGS)
|
|
||||||
AC_SUBST(GTK_LIBS)
|
|
||||||
rm -f conf.gtktest
|
|
||||||
])
|
|
||||||
|
|
@ -1,214 +0,0 @@
|
||||||
# Configure paths for GTK+
|
|
||||||
# Owen Taylor 1997-2001
|
|
||||||
|
|
||||||
# Version number used by aclocal, see `info automake Serials`.
|
|
||||||
# Increment on every change.
|
|
||||||
#serial 1
|
|
||||||
|
|
||||||
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 pass to pkg-config
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_GTK_3_0],
|
|
||||||
[m4_warn([obsolete], [AM_PATH_GTK_3_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk+-3.0]) instead])
|
|
||||||
dnl Get the cflags and libraries from pkg-config
|
|
||||||
dnl
|
|
||||||
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
|
|
||||||
, enable_gtktest=yes)
|
|
||||||
min_gtk_version=ifelse([$1], [], [3.0.0], [$1])
|
|
||||||
|
|
||||||
pkg_config_args="gtk+-3.0 >= $min_gtk_version"
|
|
||||||
for module in . $4
|
|
||||||
do
|
|
||||||
case "$module" in
|
|
||||||
gthread)
|
|
||||||
pkg_config_args="$pkg_config_args gthread-2.0"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
no_gtk=""
|
|
||||||
|
|
||||||
PKG_PROG_PKG_CONFIG([0.16])
|
|
||||||
|
|
||||||
if test -z "$PKG_CONFIG"; then
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
|
|
||||||
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
|
||||||
## don't try to run the test against uninstalled libtool libs
|
|
||||||
if $PKG_CONFIG --uninstalled $pkg_config_args; then
|
|
||||||
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
|
|
||||||
enable_gtktest=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
if $PKG_CONFIG $pkg_config_args; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"$no_gtk" = x ; then
|
|
||||||
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
|
|
||||||
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
|
|
||||||
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
||||||
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
||||||
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
||||||
if test "x$enable_gtktest" = "xyes" ; then
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$GTK_LIBS $LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
|
|
||||||
dnl checks the results of pkg-config to some extent)
|
|
||||||
dnl
|
|
||||||
rm -f conf.gtktest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
unsigned int major, minor, micro;
|
|
||||||
|
|
||||||
fclose (fopen ("conf.gtktest", "w"));
|
|
||||||
|
|
||||||
if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, µ) != 3) {
|
|
||||||
printf("%s, bad version string\n", "$min_gtk_version");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((gtk_major_version != $gtk_config_major_version) ||
|
|
||||||
(gtk_minor_version != $gtk_config_minor_version) ||
|
|
||||||
(gtk_micro_version != $gtk_config_micro_version))
|
|
||||||
{
|
|
||||||
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_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
printf ("*** was found! If pkg-config was correct, then it is best\n");
|
|
||||||
printf ("*** to remove the old version of GTK+. 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 pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
|
|
||||||
printf("*** to point to the correct configuration files\n");
|
|
||||||
}
|
|
||||||
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
|
|
||||||
(gtk_minor_version != GTK_MINOR_VERSION) ||
|
|
||||||
(gtk_micro_version != GTK_MICRO_VERSION))
|
|
||||||
{
|
|
||||||
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
|
||||||
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
|
||||||
printf("*** library (version %d.%d.%d)\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((gtk_major_version > major) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
|
|
||||||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
|
|
||||||
gtk_major_version, gtk_minor_version, gtk_micro_version);
|
|
||||||
printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
|
|
||||||
major, minor, micro);
|
|
||||||
printf("*** GTK+ 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 pkg-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of GTK+, 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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_gtk" = x ; then
|
|
||||||
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
if test -z "$PKG_CONFIG"; then
|
|
||||||
echo "*** A new enough version of pkg-config was not found."
|
|
||||||
echo "*** See http://pkgconfig.sourceforge.net"
|
|
||||||
else
|
|
||||||
if test -f conf.gtktest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run GTK+ test program, checking why..."
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$LIBS $GTK_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
|
|
||||||
echo "*** version of GTK+. If it is not finding GTK+, 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 "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
GTK_CFLAGS=""
|
|
||||||
GTK_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
AC_SUBST(GTK_CFLAGS)
|
|
||||||
AC_SUBST(GTK_LIBS)
|
|
||||||
rm -f conf.gtktest
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
|
||||||
dnl Tests for BACKEND-NAME in the GTK targets list
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([GTK_CHECK_BACKEND],
|
|
||||||
[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0]) or similar instead])
|
|
||||||
pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0)
|
|
||||||
min_gtk_version=ifelse([$2],,3.0.0,$2)
|
|
||||||
pkg_config_args="$pkg_config_args >= $min_gtk_version"
|
|
||||||
|
|
||||||
PKG_PROG_PKG_CONFIG([0.16])
|
|
||||||
AS_IF([test -z "$PKG_CONFIG"], [AC_MSG_ERROR([No pkg-config found])])
|
|
||||||
|
|
||||||
if $PKG_CONFIG $pkg_config_args ; then
|
|
||||||
target_found=yes
|
|
||||||
else
|
|
||||||
target_found=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$target_found" = "xno"; then
|
|
||||||
ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4])
|
|
||||||
else
|
|
||||||
ifelse([$3],,[:],[$3])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
@ -1,217 +0,0 @@
|
||||||
# Configure paths for GTK+
|
|
||||||
# Owen Taylor 1997-2001
|
|
||||||
|
|
||||||
dnl AM_PATH_GTK_4_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 pass to pkg-config
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([AM_PATH_GTK_4_0],
|
|
||||||
[m4_warn([obsolete], [AM_PATH_GTK_4_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk4]) instead])
|
|
||||||
dnl Get the cflags and libraries from pkg-config
|
|
||||||
dnl
|
|
||||||
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
|
|
||||||
, enable_gtktest=yes)
|
|
||||||
min_gtk_version=ifelse([$1], [], [3.90.0], [$1])
|
|
||||||
|
|
||||||
pkg_config_args="gtk4 >= $min_gtk_version"
|
|
||||||
for module in . $4
|
|
||||||
do
|
|
||||||
case "$module" in
|
|
||||||
gthread)
|
|
||||||
pkg_config_args="$pkg_config_args gthread-2.0"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
no_gtk=""
|
|
||||||
|
|
||||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
|
||||||
|
|
||||||
if test x$PKG_CONFIG != xno ; then
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** pkg-config too old; version 0.7 or better required."
|
|
||||||
no_gtk=yes
|
|
||||||
PKG_CONFIG=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
|
|
||||||
|
|
||||||
if test x$PKG_CONFIG != xno ; then
|
|
||||||
## don't try to run the test against uninstalled libtool libs
|
|
||||||
if $PKG_CONFIG --uninstalled $pkg_config_args; then
|
|
||||||
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
|
|
||||||
enable_gtktest=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
if $PKG_CONFIG $pkg_config_args; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
no_gtk=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"$no_gtk" = x ; then
|
|
||||||
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
|
|
||||||
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
|
|
||||||
gtk_config_major_version=`$PKG_CONFIG --modversion gtk4 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
||||||
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk4 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
||||||
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk4 | \
|
|
||||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
||||||
if test "x$enable_gtktest" = "xyes" ; then
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$GTK_LIBS $LIBS"
|
|
||||||
dnl
|
|
||||||
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
|
|
||||||
dnl checks the results of pkg-config to some extent)
|
|
||||||
dnl
|
|
||||||
rm -f conf.gtktest
|
|
||||||
AC_TRY_RUN([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
unsigned int major, minor, micro;
|
|
||||||
|
|
||||||
fclose (fopen ("conf.gtktest", "w"));
|
|
||||||
|
|
||||||
if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, µ) != 3) {
|
|
||||||
printf("%s, bad version string\n", "$min_gtk_version");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((gtk_get_major_version() != $gtk_config_major_version) ||
|
|
||||||
(gtk_get_minor_version() != $gtk_config_minor_version) ||
|
|
||||||
(gtk_get_micro_version() != $gtk_config_micro_version))
|
|
||||||
{
|
|
||||||
printf("\n*** 'pkg-config --modversion gtk4' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
|
|
||||||
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
|
|
||||||
gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
|
|
||||||
printf ("*** was found! If pkg-config was correct, then it is best\n");
|
|
||||||
printf ("*** to remove the old version of GTK+. 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 pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
|
|
||||||
printf("*** to point to the correct configuration files\n");
|
|
||||||
}
|
|
||||||
else if ((gtk_get_major_version() != GTK_MAJOR_VERSION) ||
|
|
||||||
(gtk_get_minor_version() != GTK_MINOR_VERSION) ||
|
|
||||||
(gtk_get_micro_version() != GTK_MICRO_VERSION))
|
|
||||||
{
|
|
||||||
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
|
|
||||||
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
|
|
||||||
printf("*** library (version %d.%d.%d)\n",
|
|
||||||
gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((gtk_get_major_version() > major) ||
|
|
||||||
((gtk_get_major_version() == major) && (gtk_get_minor_version() > minor)) ||
|
|
||||||
((gtk_get_major_version() == major) && (gtk_get_minor_version() == minor) && (gtk_get_micro_version() >= micro)))
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
|
|
||||||
gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
|
|
||||||
printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
|
|
||||||
major, minor, micro);
|
|
||||||
printf("*** GTK+ 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 pkg-config shell script is\n");
|
|
||||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
||||||
printf("*** of GTK+, 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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$no_gtk" = x ; then
|
|
||||||
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
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.gtktest ; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
echo "*** Could not run GTK+ test program, checking why..."
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
|
||||||
LIBS="$LIBS $GTK_LIBS"
|
|
||||||
AC_TRY_LINK([
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
], [ return ((gtk_get_major_version()) || (gtk_get_minor_version()) || (gtk_get_micro_version())); ],
|
|
||||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
||||||
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
|
|
||||||
echo "*** version of GTK+. If it is not finding GTK+, 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 "*** The test program failed to compile or link. See the file config.log for the"
|
|
||||||
echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
GTK_CFLAGS=""
|
|
||||||
GTK_LIBS=""
|
|
||||||
ifelse([$3], , :, [$3])
|
|
||||||
fi
|
|
||||||
AC_SUBST(GTK_CFLAGS)
|
|
||||||
AC_SUBST(GTK_LIBS)
|
|
||||||
rm -f conf.gtktest
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
|
||||||
dnl Tests for BACKEND-NAME in the GTK targets list
|
|
||||||
dnl
|
|
||||||
AC_DEFUN([GTK_CHECK_BACKEND],
|
|
||||||
[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-4.0]) or similar instead])
|
|
||||||
pkg_config_args=ifelse([$1],,gtk4, gtk4-$1)
|
|
||||||
min_gtk_version=ifelse([$2],,4.0.0,$2)
|
|
||||||
pkg_config_args="$pkg_config_args >= $min_gtk_version"
|
|
||||||
|
|
||||||
AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
|
|
||||||
|
|
||||||
if $PKG_CONFIG $pkg_config_args ; then
|
|
||||||
target_found=yes
|
|
||||||
else
|
|
||||||
target_found=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$target_found" = "xno"; then
|
|
||||||
ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4])
|
|
||||||
else
|
|
||||||
ifelse([$3],,[:],[$3])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
@ -56,7 +56,6 @@ ACLOCAL_SOURCES = \
|
||||||
build/aclocal/ax_func_which_gethostbyname_r.m4 \
|
build/aclocal/ax_func_which_gethostbyname_r.m4 \
|
||||||
build/aclocal/bakefile-lang.m4 \
|
build/aclocal/bakefile-lang.m4 \
|
||||||
build/aclocal/bakefile.m4 \
|
build/aclocal/bakefile.m4 \
|
||||||
build/aclocal/gtk-2.0.m4 \
|
|
||||||
build/aclocal/pkg.m4 \
|
build/aclocal/pkg.m4 \
|
||||||
build/aclocal/sdl.m4 \
|
build/aclocal/sdl.m4 \
|
||||||
build/aclocal/visibility.m4
|
build/aclocal/visibility.m4
|
||||||
|
|
|
||||||
50
configure.in
50
configure.in
|
|
@ -2787,24 +2787,8 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_GTK" = 1; then
|
if test "$wxUSE_GTK" = 1; then
|
||||||
dnl GTK+ test program must be compiled with C compiler
|
|
||||||
AC_MSG_CHECKING([for GTK+ version])
|
|
||||||
|
|
||||||
gtk_version_cached=1
|
|
||||||
AC_CACHE_VAL(wx_cv_lib_gtk,
|
AC_CACHE_VAL(wx_cv_lib_gtk,
|
||||||
[
|
[
|
||||||
dnl stupid GTK+ AM macros produce their own messages, so we
|
|
||||||
dnl have to pass to the next line
|
|
||||||
gtk_version_cached=0
|
|
||||||
AC_MSG_RESULT()
|
|
||||||
|
|
||||||
dnl we must link against lgthread unless the user
|
|
||||||
dnl used --disable-threads
|
|
||||||
GTK_MODULES=
|
|
||||||
if test "$wxUSE_THREADS" = "yes"; then
|
|
||||||
GTK_MODULES=gthread
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z "$wxGTK_VERSION"; then
|
if test -z "$wxGTK_VERSION"; then
|
||||||
wxGTK_VERSION=any
|
wxGTK_VERSION=any
|
||||||
fi
|
fi
|
||||||
|
|
@ -2812,27 +2796,17 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||||
dnl detect GTK2
|
dnl detect GTK2
|
||||||
wx_cv_lib_gtk=
|
wx_cv_lib_gtk=
|
||||||
|
|
||||||
dnl The gthread.pc that ships with Solaris returns '-mt',
|
|
||||||
dnl it's correct for Sun CC, but gcc requires '-pthreads'.
|
|
||||||
dnl So disable the compile check and remove the -mt below.
|
|
||||||
case "${host}" in
|
|
||||||
*-*-solaris2* )
|
|
||||||
if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
|
|
||||||
enable_gtktest=no
|
|
||||||
fi
|
|
||||||
esac
|
|
||||||
|
|
||||||
if test "$wxGTK_VERSION" = 3 -o "$wxGTK_VERSION" = any; then
|
if test "$wxGTK_VERSION" = 3 -o "$wxGTK_VERSION" = any; then
|
||||||
AM_PATH_GTK_3_0(, wx_cv_lib_gtk=3, , $GTK_MODULES)
|
PKG_CHECK_MODULES(GTK, gtk+-3.0, wx_cv_lib_gtk=3)
|
||||||
fi
|
fi
|
||||||
if test -z "$wx_cv_lib_gtk"; then
|
if test -z "$wx_cv_lib_gtk"; then
|
||||||
if test "$wxGTK_VERSION" = 2 -o "$wxGTK_VERSION" = any; then
|
if test "$wxGTK_VERSION" = 2 -o "$wxGTK_VERSION" = any; then
|
||||||
AM_PATH_GTK_2_0(2.6.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
|
PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.6.0], wx_cv_lib_gtk=2.0)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test -z "$wx_cv_lib_gtk"; then
|
if test -z "$wx_cv_lib_gtk"; then
|
||||||
if test "$wxGTK_VERSION" = 4 -o "$wxGTK_VERSION" = any; then
|
if test "$wxGTK_VERSION" = 4 -o "$wxGTK_VERSION" = any; then
|
||||||
AM_PATH_GTK_4_0(, wx_cv_lib_gtk=4, , $GTK_MODULES)
|
PKG_CHECK_MODULES(GTK, gtk4, wx_cv_lib_gtk=4)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -2845,19 +2819,21 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||||
GTK_LIBS="$GTK_LIBS -lX11"
|
GTK_LIBS="$GTK_LIBS -lX11"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl we must link against lgthread unless the user
|
||||||
|
dnl used --disable-threads
|
||||||
|
if test "$wxUSE_THREADS" = "yes"; then
|
||||||
|
PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
|
||||||
|
fi
|
||||||
|
|
||||||
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
|
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
|
||||||
dnl subsequent runs
|
dnl subsequent runs
|
||||||
wx_cv_cflags_gtk=$GTK_CFLAGS
|
wx_cv_cflags_gtk="$GTK_CFLAGS $GTHREAD_CFLAGS"
|
||||||
wx_cv_libs_gtk=$GTK_LIBS
|
wx_cv_libs_gtk="$GTK_LIBS $GTHREAD_LIBS"
|
||||||
fi
|
fi
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
dnl if it wasn't cached, the messages from AM_PATH_GTK() above are
|
AC_MSG_CHECKING([for GTK version to use])
|
||||||
dnl enough
|
|
||||||
if test "$gtk_version_cached" = 1; then
|
|
||||||
AC_MSG_RESULT($wx_cv_lib_gtk)
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$wx_cv_lib_gtk" in
|
case "$wx_cv_lib_gtk" in
|
||||||
4) WXGTK4=1
|
4) WXGTK4=1
|
||||||
|
|
@ -2877,6 +2853,8 @@ installed, where VER is 2, 3 or 4.
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
AC_MSG_RESULT([GTK $TOOLKIT_VERSION])
|
||||||
|
|
||||||
if test "$WXGTK3" = 1; then
|
if test "$WXGTK3" = 1; then
|
||||||
AC_DEFINE(__WXGTK220__)
|
AC_DEFINE(__WXGTK220__)
|
||||||
AC_DEFINE(__WXGTK218__)
|
AC_DEFINE(__WXGTK218__)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue