#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for geeqie 1.5.
+# Generated by GNU Autoconf 2.69 for geeqie 1.5.1.
#
# Report bugs to <https://github.com/BestImageViewer/geeqie/issues>.
#
# Identity of this package.
PACKAGE_NAME='geeqie'
PACKAGE_TARNAME='geeqie'
-PACKAGE_VERSION='1.5'
-PACKAGE_STRING='geeqie 1.5'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='geeqie 1.5.1'
PACKAGE_BUGREPORT='https://github.com/BestImageViewer/geeqie/issues'
PACKAGE_URL='http://www.geeqie.org/'
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures geeqie 1.5 to adapt to many kinds of systems.
+\`configure' configures geeqie 1.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of geeqie 1.5:";;
+ short | recursive ) echo "Configuration of geeqie 1.5.1:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-geeqie configure 1.5
+geeqie configure 1.5.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by geeqie $as_me 1.5, which was
+It was created by geeqie $as_me 1.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE='geeqie'
- VERSION='1.5'
+ VERSION='1.5.1'
cat >>confdefs.h <<_ACEOF
fi
- min_glib_version=2.24.0
+ min_glib_version=2.52.0
pkg_config_args="glib-2.0 >= $min_glib_version"
for module in .
do
GOBJECT_QUERY=""
GLIB_MKENUMS=""
GLIB_COMPILE_RESOURCES=""
- as_fn_error $? "GLIB >= 2.24.0 not installed." "$LINENO" 5
+ as_fn_error $? "GLIB >= 2.52.0 not installed." "$LINENO" 5
fi
rm -f conf.glibtest
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Gtk3 enabled\"" >&5
$as_echo "$as_me: WARNING: \"Gtk3 enabled\"" >&2;}
-# Check whether --enable-gtktest was given.
+fi
+
+if test x$gtk3 = xno; then
+ # Check whether --enable-gtktest was given.
if test "${enable_gtktest+set}" = set; then :
enableval=$enable_gtktest;
else
enable_gtktest=yes
fi
- min_gtk_version=3.0.0
- pkg_config_args="gtk+-3.0 >= $min_gtk_version"
+ pkg_config_args=gtk+-2.0
for module in .
do
case "$module" in
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.16
+ _pkg_min_version=0.7
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
fi
fi
- if test -z "$PKG_CONFIG"; then
- no_gtk=yes
- fi
-
+ min_gtk_version=2.20.0
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
- if test -n "$PKG_CONFIG"; then
+ 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
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
:
else
no_gtk=yes
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 | \
+ 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+-3.0 | \
+ 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+-3.0 | \
+ 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"
int
main ()
{
- unsigned int major, minor, micro;
+ int major, minor, micro;
+ char *tmp_version;
fclose (fopen ("conf.gtktest", "w"));
- if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, µ) != 3) {
+ /* 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");
exit(1);
}
(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",
+ 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");
}
else
{
- printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
+ 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 %u.%u.%u. The latest version of\n",
+ 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");
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- if test -z "$PKG_CONFIG"; then
+ if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net"
else
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
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."
+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
GTK_CFLAGS=""
GTK_LIBS=""
- as_fn_error $? "GTK+ >= 3.0.0 not installed." "$LINENO" 5
+ as_fn_error $? "GTK+ >= 2.20.0 not installed." "$LINENO" 5
fi
rm -f conf.gtktest
+ true
fi
-if test x$gtk3 = xno; then
- # Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then :
- enableval=$enable_gtktest;
-else
- enable_gtktest=yes
+threads="auto"
+# Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+ enableval=$enable_threads; threads="${enableval}"
fi
- pkg_config_args=gtk+-2.0
- for module in .
- do
- case "$module" in
- gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
- ;;
- esac
- done
+have_gthread="no"
+if test "x${threads}" != "xno" ; then
- no_gtk=""
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
+$as_echo_n "checking for GTHREAD... " >&6; }
+
+if test -n "$GTHREAD_CFLAGS"; then
+ pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTHREAD_LIBS"; then
+ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0" 2>&1`
+ else
+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTHREAD_PKG_ERRORS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
+$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
+$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
+else
+ GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
+ GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_gthread="yes"
+fi
+fi
+if test "x$have_gthread" != "xno"; then
+$as_echo "#define HAVE_GTHREAD 1" >>confdefs.h
+ GLIB_CFLAGS="$GTHREAD_CFLAGS"
+ GLIB_LIBS="$GTHREAD_LIBS"
+fi
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+
+for ac_prog in "gdk-pixbuf-csource"
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if ${ac_cv_path_GDK_PIXBUF_CSOURCE+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $PKG_CONFIG in
+ case $GDK_PIXBUF_CSOURCE in
[\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
;;
esac
fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
+if test -n "$GDK_PIXBUF_CSOURCE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5
+$as_echo "$GDK_PIXBUF_CSOURCE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+ test -n "$GDK_PIXBUF_CSOURCE" && break
+done
+
+# Extract the first word of "glib-genmarshal", so it can be a program name with args.
+set dummy glib-genmarshal; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $ac_pt_PKG_CONFIG in
+ case $GLIB_GENMARSHAL in
[\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
;;
esac
fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
+if test -n "$GLIB_GENMARSHAL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
+$as_echo "$GLIB_GENMARSHAL" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.7
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-fi
- min_gtk_version=2.20.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
-$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
- 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
+# Check whether --with-readmedir was given.
+if test "${with_readmedir+set}" = set; then :
+ withval=$with_readmedir; readmedir=$withval
+else
+ readmedir="$prefix/share/doc/geeqie-$VERSION"
+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"
- rm -f conf.gtktest
- if test "$cross_compiling" = yes; then :
- echo $ac_n "cross compiling; assumed OK... $ac_c"
+# Check whether --with-htmldir was given.
+if test "${with_htmldir+set}" = set; then :
+ withval=$with_htmldir; htmldir=$withval
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ htmldir="$readmedir/html"
+fi
-#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");
- 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+-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;
-}
+cat >>confdefs.h <<_ACEOF
+#define GQ_HELPDIR "$readmedir"
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-else
- no_gtk=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gtk" = x ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
- :
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- 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"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
- ;
- return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define GQ_HTMLDIR "$htmldir"
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- 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"
-else
- 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."
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GTK_CFLAGS=""
- GTK_LIBS=""
- as_fn_error $? "GTK+ >= 2.20.0 not installed." "$LINENO" 5
- fi
-
-
- rm -f conf.gtktest
-
- true
-fi
-
-threads="auto"
-# Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
- enableval=$enable_threads; threads="${enableval}"
-fi
-
-
-have_gthread="no"
-if test "x${threads}" != "xno" ; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
-$as_echo_n "checking for GTHREAD... " >&6; }
-
-if test -n "$GTHREAD_CFLAGS"; then
- pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GTHREAD_LIBS"; then
- pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0" 2>&1`
- else
- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GTHREAD_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
-$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5
-$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}
-else
- GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
- GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- have_gthread="yes"
-fi
-fi
-
-if test "x$have_gthread" != "xno"; then
-
-$as_echo "#define HAVE_GTHREAD 1" >>confdefs.h
-
- GLIB_CFLAGS="$GTHREAD_CFLAGS"
- GLIB_LIBS="$GTHREAD_LIBS"
-fi
-for ac_prog in "gdk-pixbuf-csource"
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+# Extract the first word of "gnome-doc-tool", so it can be a program name with args.
+set dummy gnome-doc-tool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GDK_PIXBUF_CSOURCE+:} false; then :
+if ${ac_cv_path_GNOME_DOC_TOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $GDK_PIXBUF_CSOURCE in
+ case $GNOME_DOC_TOOL in
[\\/]* | ?:[\\/]*)
- ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path.
+ ac_cv_path_GNOME_DOC_TOOL="$GNOME_DOC_TOOL" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GNOME_DOC_TOOL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
;;
esac
fi
-GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE
-if test -n "$GDK_PIXBUF_CSOURCE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5
-$as_echo "$GDK_PIXBUF_CSOURCE" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$GDK_PIXBUF_CSOURCE" && break
-done
-
-# Extract the first word of "glib-genmarshal", so it can be a program name with args.
-set dummy glib-genmarshal; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GLIB_GENMARSHAL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
-if test -n "$GLIB_GENMARSHAL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5
-$as_echo "$GLIB_GENMARSHAL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-# Check whether --with-readmedir was given.
-if test "${with_readmedir+set}" = set; then :
- withval=$with_readmedir; readmedir=$withval
-else
- readmedir="$prefix/share/doc/geeqie-$VERSION"
-fi
-
-
-# Check whether --with-htmldir was given.
-if test "${with_htmldir+set}" = set; then :
- withval=$with_htmldir; htmldir=$withval
-else
- htmldir="$readmedir/html"
-fi
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define GQ_HELPDIR "$readmedir"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define GQ_HTMLDIR "$htmldir"
-_ACEOF
-
-
-# Extract the first word of "gnome-doc-tool", so it can be a program name with args.
-set dummy gnome-doc-tool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GNOME_DOC_TOOL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GNOME_DOC_TOOL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GNOME_DOC_TOOL="$GNOME_DOC_TOOL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GNOME_DOC_TOOL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GNOME_DOC_TOOL=$ac_cv_path_GNOME_DOC_TOOL
-if test -n "$GNOME_DOC_TOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_TOOL" >&5
-$as_echo "$GNOME_DOC_TOOL" >&6; }
+GNOME_DOC_TOOL=$ac_cv_path_GNOME_DOC_TOOL
+if test -n "$GNOME_DOC_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_DOC_TOOL" >&5
+$as_echo "$GNOME_DOC_TOOL" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- if test "$gt_cv_have_gettext" = "yes" ; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
- fi
-
- if test "$XGETTEXT" != ":"; then
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
- fi
+ if test "$gt_cv_have_gettext" = "yes" ; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+ fi
+
+ if test "$XGETTEXT" != ":"; then
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+ fi
+
+ # We need to process the po/ directory.
+ POSUB=po
+
+ ac_config_commands="$ac_config_commands default-1"
+
+
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+ done
+
+
+
+
+
+
+
+
+
+
+
+
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
+ fi
+
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+
+
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ posrcprefix="$srcdir/"
+ else
+ posrcprefix="../$srcdir/"
+ fi
+ else
+ posrcprefix="../"
+ fi
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+ localedir=`eval echo "${libdir}/locale"`
+else
+ localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+
+cat >>confdefs.h <<_ACEOF
+#define GQ_LOCALEDIR "$localedir"
+_ACEOF
+
+
+
+
+
+
+
+
+
+# clutter and champlain support
+# ----------------------------------------------------------------------
+
+# Check whether --enable-map was given.
+if test "${enable_map+set}" = set; then :
+ enableval=$enable_map; libgps=$enableval
+else
+ libgps=auto
+fi
+
+
+# Check whether --enable-gpu-accel was given.
+if test "${enable_gpu_accel+set}" = set; then :
+ enableval=$enable_gpu_accel; libclutter=$enableval
+else
+ libclutter=auto
+fi
+
+
+if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER" >&5
+$as_echo_n "checking for CLUTTER... " >&6; }
+
+if test -n "$CLUTTER_CFLAGS"; then
+ pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 >= 1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$CLUTTER_LIBS"; then
+ pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 >= 1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+ else
+ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CLUTTER_PKG_ERRORS" >&5
+
+
+ HAVE_CLUTTER=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ HAVE_CLUTTER=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
+
+else
+ CLUTTER_CFLAGS=$pkg_cv_CLUTTER_CFLAGS
+ CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER_GTK" >&5
+$as_echo_n "checking for CLUTTER_GTK... " >&6; }
+
+if test -n "$CLUTTER_GTK_CFLAGS"; then
+ pkg_cv_CLUTTER_GTK_CFLAGS="$CLUTTER_GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CLUTTER_GTK_CFLAGS=`$PKG_CONFIG --cflags "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$CLUTTER_GTK_LIBS"; then
+ pkg_cv_CLUTTER_GTK_LIBS="$CLUTTER_GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CLUTTER_GTK_LIBS=`$PKG_CONFIG --libs "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+ else
+ CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CLUTTER_GTK_PKG_ERRORS" >&5
+
+
+ HAVE_CLUTTER=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+ HAVE_CLUTTER=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
+
+else
+ CLUTTER_GTK_CFLAGS=$pkg_cv_CLUTTER_GTK_CFLAGS
+ CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+ HAVE_CLUTTER=yes
+
+$as_echo "#define HAVE_CLUTTER 1" >>confdefs.h
+
+
+fi
+
+fi
+else
+ HAVE_CLUTTER=disabled
+fi
+
+
+
+
+
+
+
+# Libchamplain support - used for map facility
+# ----------------------------------------------------------------------
+
+if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" = "xyes"; then
+ if test "x${gtk3}" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN" >&5
+$as_echo_n "checking for LIBCHAMPLAIN... " >&6; }
+
+if test -n "$LIBCHAMPLAIN_CFLAGS"; then
+ pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.12 >= 0.12" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBCHAMPLAIN_LIBS"; then
+ pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.12 >= 0.12" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- # We need to process the po/ directory.
- POSUB=po
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+ else
+ LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBCHAMPLAIN_PKG_ERRORS" >&5
- ac_config_commands="$ac_config_commands default-1"
+ HAVE_LIBCHAMPLAIN=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_LIBCHAMPLAIN=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
+else
+ LIBCHAMPLAIN_CFLAGS=$pkg_cv_LIBCHAMPLAIN_CFLAGS
+ LIBCHAMPLAIN_LIBS=$pkg_cv_LIBCHAMPLAIN_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LIBCHAMPLAIN=yes
+$as_echo "#define HAVE_LIBCHAMPLAIN 1" >>confdefs.h
+fi
+ else
+ HAVE_LIBCHAMPLAIN=disabled
+ fi
+else
+ HAVE_LIBCHAMPLAIN=disabled
+fi
+if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN_GTK" >&5
+$as_echo_n "checking for LIBCHAMPLAIN_GTK... " >&6; }
+if test -n "$LIBCHAMPLAIN_GTK_CFLAGS"; then
+ pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS="$LIBCHAMPLAIN_GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS=`$PKG_CONFIG --cflags "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBCHAMPLAIN_GTK_LIBS"; then
+ pkg_cv_LIBCHAMPLAIN_GTK_LIBS="$LIBCHAMPLAIN_GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBCHAMPLAIN_GTK_LIBS=`$PKG_CONFIG --libs "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
-$as_echo_n "checking for catalogs to be installed... " >&6; }
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
-$as_echo "$LINGUAS" >&6; }
- fi
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+ else
+ LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
+ HAVE_LIBCHAMPLAIN_GTK=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
+ HAVE_LIBCHAMPLAIN_GTK=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
else
- localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-
-cat >>confdefs.h <<_ACEOF
-#define GQ_LOCALEDIR "$localedir"
-_ACEOF
+ LIBCHAMPLAIN_GTK_CFLAGS=$pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS
+ LIBCHAMPLAIN_GTK_LIBS=$pkg_cv_LIBCHAMPLAIN_GTK_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LIBCHAMPLAIN_GTK=yes
+$as_echo "#define HAVE_LIBCHAMPLAIN_GTK 1" >>confdefs.h
+fi
+else
+ HAVE_LIBCHAMPLAIN_GTK=disabled
+fi
+ if test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes; then
+ HAVE_LIBCHAMPLAIN_GTK_TRUE=
+ HAVE_LIBCHAMPLAIN_GTK_FALSE='#'
+else
+ HAVE_LIBCHAMPLAIN_GTK_TRUE='#'
+ HAVE_LIBCHAMPLAIN_GTK_FALSE=
+fi
-# clutter and champlain support
+# Lua support
# ----------------------------------------------------------------------
-# Check whether --enable-map was given.
-if test "${enable_map+set}" = set; then :
- enableval=$enable_map; libgps=$enableval
-else
- libgps=auto
-fi
-
-
-# Check whether --enable-gpu-accel was given.
-if test "${enable_gpu_accel+set}" = set; then :
- enableval=$enable_gpu_accel; libclutter=$enableval
+# Check whether --enable-lua was given.
+if test "${enable_lua+set}" = set; then :
+ enableval=$enable_lua; liblua=$enableval
else
- libclutter=auto
+ liblua=auto
fi
-if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then
+if test "x${liblua}" != "xno"; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER" >&5
-$as_echo_n "checking for CLUTTER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
-if test -n "$CLUTTER_CFLAGS"; then
- pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+ pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3 >= 5.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua5.3 >= 5.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 >= 1.0" 2>/dev/null`
+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3 >= 5.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
else
pkg_failed=untried
fi
-if test -n "$CLUTTER_LIBS"; then
- pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
+if test -n "$LUA_LIBS"; then
+ pkg_cv_LUA_LIBS="$LUA_LIBS"
elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= 1.0") 2>&5
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3 >= 5.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua5.3 >= 5.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 >= 1.0" 2>/dev/null`
+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3 >= 5.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.3 >= 5.3" 2>&1`
else
- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-1.0 >= 1.0" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.3 >= 5.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$CLUTTER_PKG_ERRORS" >&5
-
-
- HAVE_CLUTTER=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
-
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- HAVE_CLUTTER=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_PKG_ERRORS" >&2;}
+ echo "$LUA_PKG_ERRORS" >&5
-else
- CLUTTER_CFLAGS=$pkg_cv_CLUTTER_CFLAGS
- CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER_GTK" >&5
-$as_echo_n "checking for CLUTTER_GTK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
-if test -n "$CLUTTER_GTK_CFLAGS"; then
- pkg_cv_CLUTTER_GTK_CFLAGS="$CLUTTER_GTK_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+ pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_CLUTTER_GTK_CFLAGS=`$PKG_CONFIG --cflags "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
else
pkg_failed=untried
fi
-if test -n "$CLUTTER_GTK_LIBS"; then
- pkg_cv_CLUTTER_GTK_LIBS="$CLUTTER_GTK_LIBS"
+if test -n "$LUA_LIBS"; then
+ pkg_cv_LUA_LIBS="$LUA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-gtk-1.0 >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "clutter-gtk-1.0 >= 1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_CLUTTER_GTK_LIBS=`$PKG_CONFIG --libs "clutter-gtk-1.0 >= 1.0" 2>/dev/null`
+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.1 >= 5.1" 2>&1`
else
- CLUTTER_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-gtk-1.0 >= 1.0" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.1 >= 5.1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$CLUTTER_GTK_PKG_ERRORS" >&5
-
-
- HAVE_CLUTTER=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
-
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- HAVE_CLUTTER=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $CLUTTER_GTK_PKG_ERRORS" >&2;}
-
-else
- CLUTTER_GTK_CFLAGS=$pkg_cv_CLUTTER_GTK_CFLAGS
- CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- HAVE_CLUTTER=yes
-
-$as_echo "#define HAVE_CLUTTER 1" >>confdefs.h
-
-
-fi
-
-fi
-else
- HAVE_CLUTTER=disabled
-fi
-
-
-
-
-
-
+ echo "$LUA_PKG_ERRORS" >&5
-# Libchamplain support - used for map facility
-# ----------------------------------------------------------------------
-if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" = "xyes"; then
- if test "x${gtk3}" != "xno"; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN" >&5
-$as_echo_n "checking for LIBCHAMPLAIN... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
-if test -n "$LIBCHAMPLAIN_CFLAGS"; then
- pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+ pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.12 >= 0.12" 2>/dev/null`
+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
else
pkg_failed=untried
fi
-if test -n "$LIBCHAMPLAIN_LIBS"; then
- pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS"
+if test -n "$LUA_LIBS"; then
+ pkg_cv_LUA_LIBS="$LUA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= 0.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= 0.12") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.12 >= 0.12" 2>/dev/null`
+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1`
else
- LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-0.12 >= 0.12" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBCHAMPLAIN_PKG_ERRORS" >&5
+ echo "$LUA_PKG_ERRORS" >&5
- HAVE_LIBCHAMPLAIN=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_LIBCHAMPLAIN=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
else
- LIBCHAMPLAIN_CFLAGS=$pkg_cv_LIBCHAMPLAIN_CFLAGS
- LIBCHAMPLAIN_LIBS=$pkg_cv_LIBCHAMPLAIN_LIBS
+ LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+ LUA_LIBS=$pkg_cv_LUA_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_LIBCHAMPLAIN=yes
+ HAVE_LUA=yes
-$as_echo "#define HAVE_LIBCHAMPLAIN 1" >>confdefs.h
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
-fi
- else
- HAVE_LIBCHAMPLAIN=disabled
- fi
-else
- HAVE_LIBCHAMPLAIN=disabled
fi
-if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN_GTK" >&5
-$as_echo_n "checking for LIBCHAMPLAIN_GTK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
+$as_echo_n "checking for LUA... " >&6; }
-if test -n "$LIBCHAMPLAIN_GTK_CFLAGS"; then
- pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS="$LIBCHAMPLAIN_GTK_CFLAGS"
+if test -n "$LUA_CFLAGS"; then
+ pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS=`$PKG_CONFIG --cflags "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua >= 5.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
else
pkg_failed=untried
fi
-if test -n "$LIBCHAMPLAIN_GTK_LIBS"; then
- pkg_cv_LIBCHAMPLAIN_GTK_LIBS="$LIBCHAMPLAIN_GTK_LIBS"
+if test -n "$LUA_LIBS"; then
+ pkg_cv_LUA_LIBS="$LUA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.12 >= 0.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.12 >= 0.12") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua >= 5.1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCHAMPLAIN_GTK_LIBS=`$PKG_CONFIG --libs "champlain-gtk-0.12 >= 0.12" 2>/dev/null`
+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua >= 5.1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua >= 5.1" 2>&1`
else
- LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-gtk-0.12 >= 0.12" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua >= 5.1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
+ echo "$LUA_PKG_ERRORS" >&5
- HAVE_LIBCHAMPLAIN_GTK=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_LIBCHAMPLAIN_GTK=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5
-$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
else
- LIBCHAMPLAIN_GTK_CFLAGS=$pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS
- LIBCHAMPLAIN_GTK_LIBS=$pkg_cv_LIBCHAMPLAIN_GTK_LIBS
+ LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+ LUA_LIBS=$pkg_cv_LUA_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_LIBCHAMPLAIN_GTK=yes
+ HAVE_LUA=yes
-$as_echo "#define HAVE_LIBCHAMPLAIN_GTK 1" >>confdefs.h
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
-fi
-else
- HAVE_LIBCHAMPLAIN_GTK=disabled
fi
- if test "x$HAVE_LIBCHAMPLAIN_GTK" = xyes; then
- HAVE_LIBCHAMPLAIN_GTK_TRUE=
- HAVE_LIBCHAMPLAIN_GTK_FALSE='#'
else
- HAVE_LIBCHAMPLAIN_GTK_TRUE='#'
- HAVE_LIBCHAMPLAIN_GTK_FALSE=
-fi
-
+ LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+ LUA_LIBS=$pkg_cv_LUA_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LUA=yes
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
-# Lua support
-# ----------------------------------------------------------------------
-# Check whether --enable-lua was given.
-if test "${enable_lua+set}" = set; then :
- enableval=$enable_lua; liblua=$enableval
-else
- liblua=auto
fi
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
-if test "x${liblua}" != "xno"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
echo "$LUA_PKG_ERRORS" >&5
- HAVE_LUA=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_LUA=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_LUA=yes
+ HAVE_LUA=yes
$as_echo "#define HAVE_LUA 1" >>confdefs.h
echo "$LUA_PKG_ERRORS" >&5
- HAVE_LUA=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_LUA=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
+ HAVE_LUA=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LUA_PKG_ERRORS" >&5
$as_echo "$as_me: WARNING: $LUA_PKG_ERRORS" >&2;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_LUA=yes
+ HAVE_LUA=yes
+
+$as_echo "#define HAVE_LUA 1" >>confdefs.h
+
+
+fi
+
+else
+ LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
+ LUA_LIBS=$pkg_cv_LUA_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+ HAVE_LUA=yes
$as_echo "#define HAVE_LUA 1" >>confdefs.h
fi
+# _NL_TIME_FIRST_WEEKDAY support
+# note that it is an enum and not a define
+# ----------------------------------------------------------------------
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _NL_TIME_FIRST_WEEKDAY" >&5
+$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <langinfo.h>
+int
+main ()
+{
+
+char c;
+c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ nl_ok=yes
+else
+ nl_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $nl_ok" >&5
+$as_echo "$nl_ok" >&6; }
+if test "$nl_ok" = "yes"; then
+
+$as_echo "#define HAVE__NL_TIME_FIRST_WEEKDAY 1" >>confdefs.h
+
+fi
+
# ----------------------------------------------------------------------
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by geeqie $as_me 1.5, which was
+This file was extended by geeqie $as_me 1.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-geeqie config.status 1.5
+geeqie config.status 1.5.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
projects / geeqie.git / blobdiff