[GNUnet-SVN] r33410 - gnunet-gtk

[gnunet]

Author: wachs
Date: 2014-05-27 11:08:09 +0200 (Tue, 27 May 2014)
New Revision: 33410

Modified:
   gnunet-gtk/README
   gnunet-gtk/configure.ac
Log:
updating configure check and README to require gtk 3.0.0


Modified: gnunet-gtk/README
===================================================================
--- gnunet-gtk/README   2014-05-26 22:16:05 UTC (rev 33409)
+++ gnunet-gtk/README   2014-05-27 09:08:09 UTC (rev 33410)
@@ -8,7 +8,7 @@
 $ ./configure --prefix=$HOME --with-gnunet=$GNUNET_PREFIX
 $ make install
 
-gnunet-gtk requires GTK 2.6.30 or higher and libgladeui-1 or
+gnunet-gtk requires GTK 3.0.0 or higher and libgladeui-1 or
 libgladeui-2 (i.e. 3.8 or 3.10).  glade-3.8 should be used to edit the
 UI.
 gnunet-conversation-gtk requires GTK3.

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2014-05-26 22:16:05 UTC (rev 33409)
+++ gnunet-gtk/configure.ac     2014-05-27 09:08:09 UTC (rev 33410)
@@ -225,51 +225,16 @@
 
 
 AC_MSG_CHECKING(for gtk)
-check_for_3=3.0.0
-check_for_2=false
-AC_ARG_WITH(gtk_version,
-   [  --with-gtk-version=VERSION    version number of gtk to use (>=3.0.0 by 
default)],
-   [AC_MSG_RESULT([$with_gtk_version])
-    case $with_gtk_version in
-      *)
-        if test "x${with_gtk_version:0:1}" == "x2"
-        then
-          check_for_3=false
-          check_for_2=$with_gtk_version
-        elif test "x${with_gtk_version:0:1}" == "x3"
-        then
-          check_for_3=$with_gtk_version
-          check_for_2=false
-        fi
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-gtk-version not specified])])
-
 without_gtk=true
-if test "x$check_for_3" != "xfalse"
-then
-  AM_PATH_GTK_3_0([$check_for_3],without_gtk=false,)
-  # test for libunique
-  AC_ARG_WITH([libunique], AC_HELP_STRING([--without-libunique], [disable 
libunique]))
-  have_libunique=no
-  if test x$with_libunique != xno; then
-    PKG_CHECK_MODULES([unique], [unique-3.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, 
[Define if libunique is available]), AC_MSG_WARN([libunique would be nice to 
have]))
-  fi
-fi
+AM_PATH_GTK_3_0([3.0.0],without_gtk=false,)
 
-if test "x$without_gtk" == "xtrue" -a "x$check_for_2" != "xfalse"
-then
-  AM_PATH_GTK_2_0([$check_for_2],without_gtk=false,)
-  # test for libunique
-  AC_ARG_WITH([libunique], AC_HELP_STRING([--without-libunique], [disable 
libunique]))
-  have_libunique=no
-  if test x$with_libunique != xno; then
-    PKG_CHECK_MODULES([unique], [unique-1.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, 
[Define if libunique is available]), AC_MSG_WARN([libunique would be nice to 
have]))
-  fi
+# test for libunique
+AC_ARG_WITH([libunique], AC_HELP_STRING([--without-libunique], [disable 
libunique]))
+have_libunique=no
+if test x$with_libunique != xno; then
+  PKG_CHECK_MODULES([unique], [unique-3.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, 
[Define if libunique is available]), AC_MSG_WARN([libunique would be nice to 
have]))
 fi
 
-
 AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
 if test $without_gtk != true
 then