From 5be732fcd92de66614f434ebeb1bd8ec5905544d Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Mon, 22 Jun 2009 17:24:22 +0200 Subject: [PATCH] Remove automagic deps and add switches to enable/disable them --- configure.ac | 176 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 139 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index 3109048..8e5e67c 100644 --- a/configure.ac +++ b/configure.ac @@ -55,35 +55,90 @@ AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format" +# ----------------------------------------------------------- +# gtk+ +# ----------------------------------------------------------- +AC_ARG_ENABLE(gtk, + AS_HELP_STRING([--enable-gtk=@<:@no/yes/auto@:>@], + [build with gtk support]), , + enable_gtk=auto) +if test "x$enable_gtk" != "xno"; then + PKG_CHECK_MODULES(GTK, + [ + gtk+-2.0 + ], have_gtk="yes", have_gtk="no") -PKG_CHECK_MODULES(GTK, [ - gtk+-2.0 -], HAVE_GTK=yes, HAVE_GTK=no) -AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") + if test "x$have_gtk" = "xyes"; then + AC_DEFINE(HAVE_GTK, 1, [Define if you have gtk+]) + fi +else + have_gtk=no +fi + +if test "x$enable_gtk" = "xyes" -a "x$have_gtk" != "xyes"; then + AC_MSG_ERROR([Couldn't find gtk dependencies.]) +fi + +AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes") AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS) +# ----------------------------------------------------------- +# connectivity +# ----------------------------------------------------------- + CONNECTIVITY="None" -PKG_CHECK_MODULES(CONIC, [ - conic -], HAVE_CONIC=yes, HAVE_CONIC=no) -if test "x$HAVE_CONIC" = "xyes"; then - CONNECTIVITY="Maemo LibConIC" - CONNECTIVITY_LIBS=${CONIC_LIBS} - CONNECTIVITY_CFLAGS=${CONIC_CFLAGS} - AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed]) +AC_ARG_ENABLE(conic, + AS_HELP_STRING([--enable-conic=@<:@no/yes/auto@:>@], + [build with conic support]), , + enable_conic=auto) + +if test "x$enable_conic" != "xno"; then + PKG_CHECK_MODULES(CONIC, + [ + conic + ], have_conic="yes", have_conic="no") + + if test "x$have_conic" = "xyes"; then + CONNECTIVITY="Maemo LibConIC" + CONNECTIVITY_LIBS=${CONIC_LIBS} + CONNECTIVITY_CFLAGS=${CONIC_CFLAGS} + AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed]) + fi +else + have_conic=no +fi + +if test "x$enable_conic" = "xyes" -a "x$have_conic" != "xyes"; then + AC_MSG_ERROR([Couldn't find conic dependencies.]) fi -PKG_CHECK_MODULES(NETWORK_MANAGER, [ - NetworkManager -], HAVE_NETWORK_MANAGER=yes, HAVE_NETWORK_MANAGER=no) -if test "x$HAVE_NETWORK_MANAGER" = "xyes"; then - CONNECTIVITY="Network Manager" - CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS} - CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS} - AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed]) + +AC_ARG_ENABLE(networkmanager, + AS_HELP_STRING([--enable-networkmanager=@<:@no/yes/auto@:>@], + [build with NetworkManager support]), , + enable_networkmanager=auto) + +if test "x$enable_networkmanager" != "xno"; then + PKG_CHECK_MODULES(NETWORKMANAGER, + [ + NetworkManager + ], have_networkmanager="yes", have_networkmanager="no") + + if test "x$have_networkmanager" = "xyes"; then + CONNECTIVITY="Network Manager" + CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS} + CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS} + AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed]) + fi +else + have_networkmanager=no +fi + +if test "x$enable_networkmanager" = "xyes" -a "x$have_networkmanager" != "xyes"; then + AC_MSG_ERROR([Couldn't find Network Manager dependencies.]) fi AC_SUBST(CONNECTIVITY_LIBS) @@ -92,35 +147,82 @@ AC_SUBST(CONNECTIVITY_CFLAGS) PROVIDER_SUBDIRS="example hostip geonames manual plazes localnet yahoo" -PKG_CHECK_MODULES(GSMLOC, [ - gammu >= 1.12 -], HAVE_GSMLOC=yes, HAVE_GSMLOC=no) -if test "x$HAVE_GSMLOC" = "xyes"; then - PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc" +# ----------------------------------------------------------- +# gsmloc / gypsy / gpsd +# ----------------------------------------------------------- + +AC_ARG_ENABLE(gsmloc, + AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@], + [build with gsmloc support]), , + enable_gsmloc=auto) + +if test "x$enable_gsmloc" != "xno"; then + PKG_CHECK_MODULES(GSMLOC, + [ + gammu >= 1.12 + ], have_gsmloc="yes", have_gsmloc="no") + + if test "x$have_gsmloc" = "xyes"; then + PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc" + else + NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc" + fi else - NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc" + have_gsmloc=no +fi + +if test "x$enable_gsmloc" = "xyes" -a "x$have_gsmloc" != "xyes"; then + AC_MSG_ERROR([Couldn't find gsmloc dependencies.]) fi AC_SUBST(GSMLOC_LIBS) AC_SUBST(GSMLOC_CFLAGS) -PKG_CHECK_MODULES(GYPSY, [ - gypsy -], HAVE_GYPSY=yes,HAVE_GYPSY=no) -if test "x$HAVE_GYPSY" = "xyes"; then - PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy" +AC_ARG_ENABLE(gypsy, + AS_HELP_STRING([--enable-gypsy=@<:@no/yes/auto@:>@], + [build with gypsy support]), , + enable_gypsy=auto) + +if test "x$enable_gypsy" != "xno"; then + PKG_CHECK_MODULES(GYPSY, + [ + gypsy + ], have_gypsy="yes", have_gypsy="no") + + if test "x$have_gypsy" = "xyes"; then + PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy" + else + NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy" + fi else - NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy" + have_gypsy=no +fi + +if test "x$enable_gypsy" = "xyes" -a "x$have_gypsy" != "xyes"; then + AC_MSG_ERROR([Couldn't find gypsy dependencies.]) fi AC_SUBST(GYPSY_LIBS) AC_SUBST(GYPSY_CFLAGS) -AC_CHECK_LIB(gps, gps_open,[libgps=yes] ) -if test "x$libgps" = xyes; then - PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd" - GPSD_LIBS="-lgps" +AC_ARG_ENABLE(gpsd, + AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@], + [build with gpsd support]), , + enable_gpsd=auto) + +if test "x$enable_gpsd" != "xno"; then + AC_CHECK_LIB(gps, gps_open,[libgps=yes] ) + if test "x$have_gpsd" = "xyes"; then + PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd" + GPSD_LIBS="-lgps" + else + NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd" + fi else - NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd" + have_gpsd=no +fi + +if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then + AC_MSG_ERROR([Couldn't find gpsd dependencies.]) fi AC_SUBST(GPSD_LIBS) AC_SUBST(GPSD_CFLAGS) -- 1.6.3.1