gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r21736 - gnunet-gtk


From: gnunet
Subject: [GNUnet-SVN] r21736 - gnunet-gtk
Date: Sun, 3 Jun 2012 11:14:56 +0200

Author: grothoff
Date: 2012-06-03 11:14:56 +0200 (Sun, 03 Jun 2012)
New Revision: 21736

Modified:
   gnunet-gtk/configure.ac
Log:
-LRN: More control over gtk version being used

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2012-06-03 09:04:50 UTC (rev 21735)
+++ gnunet-gtk/configure.ac     2012-06-03 09:14:56 UTC (rev 21736)
@@ -174,20 +174,43 @@
  AC_MSG_ERROR([gnunet-gtk requires libextractor headers])
 fi
 
-# check for gtk >= 3.0.0
 AC_MSG_CHECKING(for gtk)
-without_gtk=true
-AM_PATH_GTK_3_0(3.0.0,without_gtk=false,)
-if test $without_gtk = true
+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=false
+if test "x$check_for_3" != "xfalse"
 then
-  AM_PATH_GTK_2_0(2.6.0,without_gtk=false,)
+  AM_PATH_GTK_3_0([$check_for_3],without_gtk=false,)
 fi
+if test "x$without_gtk" == "xfalse" -a "x$check_for_2" != "xfalse"
+then
+  AM_PATH_GTK_2_0([$check_for_2],without_gtk=false,)
+fi
 AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
 if test $without_gtk != true
 then
- AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK])
+  AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK])
 else
- AC_MSG_ERROR(Cannot find GTK: Is pkg-config in path?)
+  AC_MSG_ERROR(Cannot find GTK: Is pkg-config in path?)
 fi
 CFLAGS="$CFLAGS $GTK_CFLAGS"
 CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"




reply via email to

[Prev in Thread] Current Thread [Next in Thread]