[gnome-main-menu] [build] Support both libnm-glib and libnm_glib pkg-config names



commit a993420178412b522387d4ef451b2525065967a9
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Jan 22 14:15:33 2010 +0100

    [build] Support both libnm-glib and libnm_glib pkg-config names
    
    Apparently, with NetworkManager 0.8, libnm_glib was renamed to
    libnm-glib.

 configure.in |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 63b9137..b154fc8 100644
--- a/configure.in
+++ b/configure.in
@@ -58,7 +58,13 @@ PKG_CHECK_MODULES(GLADE, libglade-2.0)
 AC_SUBST(GLADE_CFLAGS)
 AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ])
+NM_GLIB=
+PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ])
+if test "x$NM_GLIB" = "x"; then
+	PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
+fi
+
+PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 hal-storage cairo ])
 
 AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no, -lm)], have_iwlib=no)
 



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