[gupnp] build: Don’t add libuuid to pkg-config fi les if it’s not a dependency



commit 067d43d3debaf09cd37e362f47ba60315b521edc
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Mon Apr 21 16:20:03 2014 +0100

    build: Don’t add libuuid to pkg-config files if it’s not a dependency
    
    When targeting a build at MinGW, Cygwin or Darwin, libgupnp doesn’t have
    a dependency on libuuid, so don’t state that it does in the installed
    pkg-config file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711027

 configure.ac                |    9 +++++----
 gupnp-1.0-uninstalled.pc.in |    2 +-
 gupnp-1.0.pc.in             |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 42b0c0a..bd03565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,17 +34,18 @@ case "$target_os" in
      mingw*|cygwin*)
         os_win32=yes
         AC_MSG_RESULT(Win32)
-        UUID=
+        UUID_LIBS=
         ;;
      darwin*)
         AC_MSG_RESULT(Darwin)
-        UUID=
+        UUID_LIBS=
         ;;
      *)
         AC_MSG_RESULT($target_os)
-        UUID=uuid
+        UUID_LIBS=uuid
         ;;
 esac
+AC_SUBST([UUID_LIBS])
 
 PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.24.0 \
                             gio-2.0 \
@@ -52,7 +53,7 @@ PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.24.0 \
                             gssdp-1.0 >= 0.13.0 \
                             libsoup-2.4 >= 2.28.2 \
                             libxml-2.0 \
-                            $UUID)
+                            $UUID_LIBS)
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
 
 AM_CONDITIONAL(OS_WIN32, test "x$os_win32" = "xyes")
diff --git a/gupnp-1.0-uninstalled.pc.in b/gupnp-1.0-uninstalled.pc.in
index 1a15b03..c44a201 100644
--- a/gupnp-1.0-uninstalled.pc.in
+++ b/gupnp-1.0-uninstalled.pc.in
@@ -8,4 +8,4 @@ Description: GObject-based UPnP library
 Version: @VERSION@
 Libs: ${libdir}/libgupnp-1.0.la
 Cflags: -I${includedir}
-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 uuid
+Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@
diff --git a/gupnp-1.0.pc.in b/gupnp-1.0.pc.in
index 7600730..51e0128 100644
--- a/gupnp-1.0.pc.in
+++ b/gupnp-1.0.pc.in
@@ -8,4 +8,4 @@ Description: GObject-based UPnP library
 Version: @VERSION@
 Libs: -L${libdir} -lgupnp-1.0
 Cflags: -I${includedir}/gupnp-1.0
-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 uuid
+Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@


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