diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac index cf75f0e..54d39c1 100644 --- a/configure.ac +++ b/configure.ac @@ -15,9 +15,7 @@ AM_SILENT_RULES([yes]) GLIB2_REQUIRED=2.22.0 LIBXML2_REQUIRED="2.6.0" LIBVIRT_REQUIRED="0.10.0" -GTK2_REQUIRED="2.18.0" GTK3_REQUIRED="3.0" -GTK_VNC1_REQUIRED="0.3.8" GTK_VNC2_REQUIRED="0.4.0" SPICE_GTK_REQUIRED="0.29.35" SPICE_PROTOCOL_REQUIRED="0.12.7" @@ -26,9 +24,7 @@ GOVIRT_REQUIRED="0.3.2" AC_SUBST([GLIB2_REQUIRED]) AC_SUBST([LIBXML2_REQUIRED]) AC_SUBST([LIBVIRT_REQUIRED]) -AC_SUBST([GTK2_REQUIRED]) AC_SUBST([GTK3_REQUIRED]) -AC_SUBST([GTK_VNC1_REQUIRED]) AC_SUBST([GTK_VNC2_REQUIRED]) AC_SUBST([SPICE_GTK_REQUIRED]) AC_SUBST([SPICE_PROTOCOL_REQUIRED]) @@ -121,36 +117,15 @@ AC_CHECK_LIB([virt], [AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have virDomainOpenGraphicsFD?])]) LIBS=$old_LIBS -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: 3.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=3.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=$GTK2_REQUIRED - GTK_VNC_REQUIRED=$GTK_VNC1_REQUIRED - GTK_VNC_API_VERSION=1.0 - SPICE_GTK_API_VERSION=2.0 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=$GTK3_REQUIRED - GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED - GTK_VNC_API_VERSION=2.0 - SPICE_GTK_API_VERSION=3.0 - ;; -esac +GTK_API_VERSION=3.0 +GTK_REQUIRED=$GTK3_REQUIRED +GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED +GTK_VNC_API_VERSION=2.0 +SPICE_GTK_API_VERSION=3.0 AC_SUBST([GTK_API_VERSION]) AC_SUBST([GTK_REQUIRED]) AC_SUBST([GTK_VNC_API_VERSION]) -AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"]) -AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"]) PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) @@ -275,10 +250,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([ Features:]) -AC_MSG_NOTICE([]) -AC_MSG_NOTICE([ Gtk: $with_gtk]) -AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Libraries:]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ GLIB2: $GLIB2_CFLAGS $GLIB2_LIBS]) |