[gnome-themes-standard] Better error message for missing dependencies



commit dc561460e3d6e53d1d222f3e41548e6715e0cfe5
Author: Xan Lopez <xan igalia com>
Date:   Sat Dec 10 13:42:02 2011 +0100

    Better error message for missing dependencies
    
    Let pkg-config give the default error message, it will tell you
    whether GTK+ or librsvg (or both) are missing. Right now we just say
    GTK+ is not present, even if it's librsvg the one missing.
    
    Also use DEPENDENCIES for the variable instead of GTK, since there's
    more dependencies than GTK+.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=665909

 configure.ac    |    7 +++----
 src/Makefile.am |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d294c97..d4237a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,11 +30,10 @@ AM_GLIB_GNU_GETTEXT
 
 GTK_VERSION_REQUIRED=3.3.3
 
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0,,
-                  AC_MSG_ERROR([GTK+ $GTK_VERSION_REQUIRED is required to compile gnome-themes-standard]))
+PKG_CHECK_MODULES([DEPENDENCIES], [gtk+-3.0 >= $GTK_VERSION_REQUIRED librsvg-2.0])
 
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+AC_SUBST(DEPENDENCIES_CFLAGS)
+AC_SUBST(DEPENDENCIES_LIBS)
 
 GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
 AC_SUBST(GTK_VERSION)
diff --git a/src/Makefile.am b/src/Makefile.am
index f9761e2..4af67bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ assetsdir = $(datadir)/themes/Adwaita/gtk-3.0/assets
 
 INCLUDES = \
 	-DASSETS_DIR=\""$(assetsdir)"\" \
-	$(GTK_CFLAGS)
+	$(DEPENDENCIES_CFLAGS)
 
 libadwaita_la_SOURCES =			\
 	adwaita_utils.h			\
@@ -13,7 +13,7 @@ libadwaita_la_SOURCES =			\
 	adwaita_engine.c
 
 libadwaita_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/src/engine.symbols
-libadwaita_la_LIBADD =  $(GTK_LIBS)
+libadwaita_la_LIBADD =  $(DEPENDENCIES_LIBS)
 
 EXTRA_DIST = engine.symbols
 



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