From: Zeeshan Ali (Khattak) Date: Wed, 11 Aug 2010 10:37:45 +0000 (+0300) Subject: build: Minor refactoring of configure.ac X-Git-Tag: RYGEL_0_7_4~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bce1271413fa46ea6bc56b65f9839df547369b1;p=profile%2Fivi%2Frygel.git build: Minor refactoring of configure.ac --- diff --git a/configure.ac b/configure.ac index ce090e6..bec0330 100644 --- a/configure.ac +++ b/configure.ac @@ -35,27 +35,6 @@ UUID_REQUIRED=1.41.3 LIBSOUP_REQUIRED=2.26.0 LIBSQLITE3_REQUIRED=3.5 -AC_MSG_CHECKING([which gtk+ version to compile against]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=2.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 2.0) GTK_VAPI_VERSION=2.0 - GTK_REQUIRED=2.21.5 - ;; - 3.0) GTK_VAPI_VERSION=3.0 - GTK_REQUIRED=2.90.3 - ;; -esac - - - PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED) PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED) PKG_CHECK_MODULES(LIBGUPNP_DLNA, gupnp-dlna-1.0 >= $GUPNP_DLNA_REQUIRED) @@ -153,6 +132,25 @@ if test "x$enable_uninstalled" = "xyes"; then AC_MSG_WARN("You want to run the tools uninstalled only? Fine!") fi +AC_MSG_CHECKING([which gtk+ version to compile against]) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], + [case "$with_gtk" in + 2.0|3.0) ;; + *) AC_MSG_ERROR([invalid gtk version specified]) ;; + esac], + [with_gtk=2.0]) +AC_MSG_RESULT([$with_gtk]) + +case "$with_gtk" in + 2.0) GTK_VAPI_VERSION=2.0 + GTK_REQUIRED=2.21.5 + ;; + 3.0) GTK_VAPI_VERSION=3.0 + GTK_REQUIRED=2.90.3 + ;; +esac + # Check wether user wants to build UIs AC_ARG_WITH( ui, AC_HELP_STRING([--without-ui],[Do not build UI applications]),