X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/5cd09d5716cca058b8270f13678d9d37ce7ed4ab..90ba111cbdaf442cd8a4312585d4ea01058e7f7c:/configure.ac diff --git a/configure.ac b/configure.ac index 28a263b5..73b57b92 100644 --- 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.5, , 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.16 gio-2.0 >= 2.12 ]) @@ -103,18 +104,6 @@ if test "x$ac_cv_enable_deprecations" = "xyes"; then fi # Options -AC_ARG_ENABLE(alphabetized-trw, AC_HELP_STRING([--enable-alphabetized-trw], - [enable alphabetized track & waypoints (default is enable)]), - [ac_cv_enable_alpha_trw=$enableval], - [ac_cv_enable_alpha_trw=yes]) -AC_CACHE_CHECK([whether to enable alphabetized track & waypoint], - [ac_cv_enable_alpha_trw], [ac_cv_enable_alpha_trw=yes]) -case $ac_cv_enable_alpha_trw in - yes) - AC_DEFINE(VIK_CONFIG_ALPHABETIZED_TRW, [], [NO ALPHABETIZED TRW]) - ;; -esac - AC_ARG_ENABLE(bing, AC_HELP_STRING([--enable-bing], [enable Bing stuff (default is enable)]), [ac_cv_enable_bing=$enableval], @@ -129,7 +118,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 +130,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], @@ -291,6 +267,53 @@ case $ac_cv_enable_realtimegpstracking in esac AM_CONDITIONAL([REALTIME_GPS_TRACKING], [test x$ac_cv_enable_realtimegpstracking = xyes]) +# BZIP2 +AC_ARG_ENABLE(bz2, AC_HELP_STRING([--enable-bzip2], + [enable bzip2 Support (default is enable).]), + [ac_cv_enable_bzip2=$enableval], + [ac_cv_enable_bzip2=yes]) +AC_CACHE_CHECK([whether to enable bzip2 Support], + [ac_cv_enable_bzip2], [ac_cv_enable_bzip2=yes]) +case $ac_cv_enable_bzip2 in + yes) + AC_CHECK_HEADERS([bzlib.h],[],[AC_MSG_ERROR([bzlib.h is needed but not found - you will need to install package 'libbz2-dev' or similar. The feature can be disabled with --disable-bzip2])]) + AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffDecompress, [], [AC_MSG_ERROR([libbz2 is needed but not found.])]) + ;; +esac +AM_CONDITIONAL([BZIP2], [test x$ac_cv_enable_bzip2 = xyes]) + +# FILE MAGIC +AC_ARG_ENABLE(magic, AC_HELP_STRING([--enable-magic], + [enable File Magic support via libmagic (default is enable).]), + [ac_cv_enable_magic=$enableval], + [ac_cv_enable_magic=yes]) +AC_CACHE_CHECK([whether to enable Magic Support], + [ac_cv_enable_magic], [ac_cv_enable_magic=yes]) +case $ac_cv_enable_magic in + yes) + AC_CHECK_HEADERS([magic.h],[],[AC_MSG_ERROR([magic.h is needed but not found - you will need to install package 'libmagic-dev' or similar. The feature can be disabled with --disable-magic])]) + AC_CHECK_LIB(magic, magic_open, [], [AC_MSG_ERROR([libmagic is needed but not found.])]) + ;; +esac +AM_CONDITIONAL([MAGIC], [test x$ac_cv_enable_magic = xyes]) + +# SQL for MBTiles +AC_ARG_ENABLE(mbtiles, AC_HELP_STRING([--enable-mbtiles], + [enable MBTiles support via libsqlite3 (default is enable).]), + [ac_cv_enable_mbtiles=$enableval], + [ac_cv_enable_mbtiles=yes]) +AC_CACHE_CHECK([whether to enable MBTiles Support], + [ac_cv_enable_mbtiles], [ac_cv_enable_mbtiles=yes]) +case $ac_cv_enable_mbtiles in + yes) + AC_CHECK_HEADERS([sqlite3.h],[],[AC_MSG_ERROR([sqlite3.h is needed but not found - you will need to install package 'libsqlite3-dev' or similar. The feature can be disabled with --disable-mbtiles])]) + AC_CHECK_LIB(sqlite3, sqlite3_open, [], [AC_MSG_ERROR([libsqlite3 is needed but not found.])]) + ;; +esac +AM_CONDITIONAL([SQLITE], [test x$ac_cv_enable_mbtiles = xyes]) + +### + AC_ARG_WITH(search, [AC_HELP_STRING([--with-search], [specify google or geonames for searching (default is google)])], @@ -363,10 +386,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])]) @@ -380,10 +407,8 @@ echo "" echo "===========================================" 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" @@ -394,6 +419,9 @@ echo "Geocaches Acquire : $ac_cv_enable_geocaches" echo "Geotag Support : $ac_cv_enable_geotag" echo "USGS 24k DEM : $ac_cv_enable_dem24k" echo "Realtime GPS Tracking : $ac_cv_enable_realtimegpstracking" +echo "bzip2 Support : $ac_cv_enable_bzip2" +echo "File Magic Support : $ac_cv_enable_magic" +echo "MBTiles Support (SQLite3) : $ac_cv_enable_mbtiles" echo "Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE}" echo "Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE}" echo "Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html})"