[network-manager-netbook: 12/17] fix path escaping problems with mobile broadband provider db

[Dan Williams <dcbw src gnome org>]

commit 9ee0f9d4d27c057d0f2e4940bd5da6bbe589814b
Author: Andrew Wafaa <awafaa opensuse org>
Date:   Wed Nov 3 15:20:56 2010 +0000

    fix path escaping problems with mobile broadband provider db

 configure.in          |    6 +++++-
 libnm-gtk/Makefile.am |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index f7b53e8..6afd971 100644
--- a/configure.in
+++ b/configure.in
@@ -24,10 +24,14 @@ AM_GLIB_GNU_GETTEXT
 
 NM_REQUIRED=0.7.996
 
-PKG_CHECK_MODULES(LIBNM_GTK, gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util >= $NM_REQUIRED libnm-glib >= $NM_REQUIRED mobile-broadband-provider-info)
+PKG_CHECK_MODULES(LIBNM_GTK, gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util >= $NM_REQUIRED libnm-glib >= $NM_REQUIRED)
 
 PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnotify libnm-util >= $NM_REQUIRED libnm-glib >= $NM_REQUIRED meego-panel mx-1.0 mx-gtk-1.0)
 
+dnl Check for mobile broadband provider database
+MBPI_DATABASE_PATH=`$PKG_CONFIG --variable=database`
+AC_SUBST(MBPI_DATABASE_PATH)
+
 dnl Check for gnome-bluetooth
 PKG_CHECK_MODULES(GNOME_BLUETOOTH,
 		  gconf-2.0
diff --git a/libnm-gtk/Makefile.am b/libnm-gtk/Makefile.am
index 873366d..d031ef9 100644
--- a/libnm-gtk/Makefile.am
+++ b/libnm-gtk/Makefile.am
@@ -8,6 +8,7 @@ libnm_gtk_la_CPPFLAGS = \
 	-DUIDIR=\""$(uidir)"\" \
 	-DICONDIR=\""$(pkgdatadir)/icons"\" \
 	$(LIBNM_GTK_CFLAGS) \
+	-DMOBILE_BROADBAND_PROVIDER_INFO=\""$(MBPI_DATABASE_PATH)"\" \
 	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/libnm-gtk/wireless-security \
 	$(NULL)