Fix selection of trackpoint via Edit Trackpoint button.

[andy/viking.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 28a263b561305fdb7eb8beef84c73f6d48679f82..e85c004149bd03c77086e0a8ad90ec020950c050 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(viking, 1.3.2)
+AC_INIT(viking, 1.4.1, , viking, http://viking.sf.net/)
 AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
@@ -33,18 +33,19 @@ AC_SUBST(ACLOCAL_AMFLAGS)
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([malloc.h netdb.h netinet/in.h stdlib.h string.h sys/param.h sys/socket.h sys/types.h sys/wait.h unistd.h math.h utime.h X11/Xlib.h])
+AC_CHECK_HEADERS([malloc.h stdlib.h string.h sys/param.h sys/types.h unistd.h math.h utime.h X11/Xlib.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_MODE_T
 
-# Checks for library functions.
+# Checks for library functions or symbols
 AC_FUNC_STAT
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([floor gethostbyname memset mkdtemp pow realpath socket sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
+AC_CHECK_FUNCS([floor memset mkdtemp pow realpath sqrt strcasecmp strchr strdup strncasecmp strtol strtoul])
 AC_CHECK_LIB(m, tan)
 AC_CHECK_LIB(z, inflate)
+AC_CHECK_LIB(X11, XSetErrorHandler)
 
 # Expat
 AM_WITH_EXPAT
@@ -64,9 +65,9 @@ dnl | Pkgconfig checks |---------------------------------------
 dnl  ------------------
 
 PKG_CHECK_MODULES(PACKAGE, [
-        glib-2.0          >= 2.14
+        glib-2.0          >= 2.16
         gthread-2.0       >= 2.2
-        gtk+-2.0          >= 2.12
+        gtk+-2.0          >= 2.14
         gio-2.0           >= 2.12
 ])
 
@@ -129,7 +130,7 @@ esac
 AM_CONDITIONAL([BING], [test x$ac_cv_enable_bing = xyes])
 
 AC_ARG_ENABLE(google, AC_HELP_STRING([--enable-google],
-              [enable Google stuff (Goto and External Open) (default is enable)]),
+              [enable Google stuff (default is enable)]),
               [ac_cv_enable_google=$enableval],
               [ac_cv_enable_google=yes])
 AC_CACHE_CHECK([whether to enable Google stuff],
@@ -141,19 +142,6 @@ case $ac_cv_enable_google in
 esac
 AM_CONDITIONAL([GOOGLE], [test x$ac_cv_enable_google = xyes])
 
-
-AC_ARG_ENABLE(google-directions, AC_HELP_STRING([--enable-google-directions],
-              [enable Google Directions (default is disabled because it does not work)]),
-              [ac_cv_enable_google_directions=$enableval],
-              [ac_cv_enable_google_directions=no])
-AC_CACHE_CHECK([whether to enable Google directions],
-               [ac_cv_enable_google_directions], [ac_cv_enable_google_directions=yes])
-case $ac_cv_enable_google_directions in
-  yes)
-    AC_DEFINE(VIK_CONFIG_GOOGLE_DIRECTIONS, [], [GOOGLE DIRECTIONS])
-    ;;
-esac
-
 AC_ARG_ENABLE(terraserver, AC_HELP_STRING([--enable-terraserver],
               [enable Terraserver stuff (default is enable)]),
               [ac_cv_enable_terraserver=$enableval],
@@ -363,10 +351,14 @@ AC_CONFIG_FILES([
                src/icons/Makefile
                po/Makefile.in
                data/Makefile
-               test/Makefile])
+               test/Makefile
+               help/Makefile
+               win32/Makefile
+               win32/installer/Makefile
+               win32/installer/pixmaps/Makefile
+               win32/installer/translations/Makefile])
 AM_COND_IF([VIKING_DOC],
        [AC_CONFIG_FILES([
-               help/Makefile
                doc/Makefile
                doc/reference/Makefile
                doc/examples/Makefile])])
@@ -382,8 +374,7 @@ echo "$PACKAGE $VERSION"
 echo "-------------------------------------------"
 echo "Alphabetized track & waypoints   : $ac_cv_enable_alpha_trw"
 echo "Bing Maps                        : $ac_cv_enable_bing"
-echo "Google Goto                      : $ac_cv_enable_google"
-echo "Google Directions (Broken)       : $ac_cv_enable_google_directions"
+echo "Google                           : $ac_cv_enable_google"
 echo "Terraserver Maps                 : $ac_cv_enable_terraserver"
 echo "Expedia Maps                     : $ac_cv_enable_expedia"
 echo "Open Street Map                  : $ac_cv_enable_openstreetmap"