# 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])
# 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])
+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
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
])
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],
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],
AC_ARG_WITH(mapcache,
[AC_HELP_STRING([--with-mapcache],
- [specify the size of the map cache (default is 50331648)])],
+ [specify the size of the map cache in MB (default is 128)])],
[if test "x$withval" = "xno"; then
VIK_CONFIG_MAPCACHE_SIZE=0;
elif test "x$withval" = "xyes"; then
- AC_MSG_ERROR([Please, set a value for size of the map cache])
+ AC_MSG_ERROR([Please, set a value for size of the map cache in MB])
else
VIK_CONFIG_MAPCACHE_SIZE=${withval}
fi],
- [VIK_CONFIG_MAPCACHE_SIZE=50331648])
+ [VIK_CONFIG_MAPCACHE_SIZE=128])
AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPCACHE_SIZE, ${VIK_CONFIG_MAPCACHE_SIZE},
[Size of the map cache])
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])])
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"