[PINENTRY PATCH] build: Avoid unnecessary dependency on gtk+-2 for GNOME3 development.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Sat Nov 5 05:44:53 CET 2016
* configure.ac: There is no reason to reject building the GNOME3
pinentry if GTK+-2 development libraries are not present. GNOME3 does
not require GTK+-2.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
configure.ac | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1dfdf17..2a96ccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -438,14 +438,13 @@ if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
fi
dnl check if the module gtk+-2.0 exists
-if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
+if test "$pinentry_gtk_2" != "no"; then
AC_MSG_CHECKING([for gtk+-2])
"${PKG_CONFIG}" --exists gtk+-2.0
if test $? -ne 0 ; then
AC_MSG_RESULT([no])
AC_MSG_WARN([pkg-config could not find the module gtk+-2.0])
pinentry_gtk_2=no
- pinentry_gnome_3=no
else
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([gtk+-2 version >= 2.4.0])
@@ -455,7 +454,6 @@ if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
if test $? -ne 0 ; then
AC_MSG_WARN([building GTK+-2 pinentry disabled])
pinentry_gtk_2=no
- pinentry_gnome_3=no
else
GTK2CFLAGS=`"${PKG_CONFIG}" --cflags gtk+-2.0`
GTK2LIBS=`"${PKG_CONFIG}" --libs gtk+-2.0`
@@ -465,10 +463,6 @@ if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
then
pinentry_gtk_2=yes
fi
- if test "$pinentry_gnome_3" != "no"
- then
- pinentry_gnome_3=yes
- fi
fi
fi
fi
--
2.10.1
More information about the Gnupg-devel
mailing list