Changeset 20aac0cb70064af0988e83315bdac9e197eae9a5

Timestamp:

03/27/11 16:41:33 (2 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

77ca41d9d889608a4373d0acaab6fbf8c822d5d1

Children:

44eeb15f37d732cea9dc41fc72852c3231570ab0

git-committer:

Armin Burgmeier <armin@arbur.net> / 2011-03-27T16:41:33Z+0200

Message:

Use unique-3.0 when compiling against GTK+ 3.0

2011-02-27 Armin Burgmeier <armin@…>

• configure.ac: Use unique-3.0 when compiling against GTK+ 3.0.

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (1 diff)

ChangeLog

@@ +1 @@
+2011-02-27  Armin Burgmeier  <armin@arbur.net>
+
+        * configure.ac: Use unique-3.0 when compiling against GTK+ 3.0.
+
 2011-01-30  Armin Burgmeier  <armin@arbur.net>
 

configure.ac

@@ -110 +110 @@
             [use_unique=$withval], [use_unique=auto])
 
-# Ignore this setting if not using unique,
-# we might later use GtkApplication instead
 if test "$with_gtk3" != "yes"; then
-  if test "x$use_unique" = "xauto"; then
-    PKG_CHECK_MODULES([unique], [unique-1.0 >= 1.1.2], [use_unique=yes], [use_unique=no])
-  elif test "x$use_unique" = "xyes"; then
-    PKG_CHECK_MODULES([unique], [unique-1.0 >= 1.1.2])
-  fi
-
-  if test "x$use_unique" = "xyes"; then
-    AC_DEFINE([WITH_UNIQUE], 1, [Whether support for unique is enabled])
-  fi
+  unique_req="unique-1.0 >= 1.1.2"
 else
-  use_unique="no"
+  unique_req="unique-3.0"
+fi
+
+if test "x$use_unique" = "xauto"; then
+  PKG_CHECK_MODULES([unique], [$unique_req], [use_unique=yes], [use_unique=no])
+elif test "x$use_unique" = "xyes"; then
+  PKG_CHECK_MODULES([unique], [$unique_req])
+fi
+
+if test "x$use_unique" = "xyes"; then
+  AC_DEFINE([WITH_UNIQUE], 1, [Whether support for unique is enabled])
 fi