removed configure from rep

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@29 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

configure.in

@@ -27,6 +27,17 @@ PKG_CHECK_MODULES(OPENSSL, openssl)
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(0PENSSL_LIBS)
 
+# taken from hal
+AC_ARG_WITH(dbus-sys, [  --with-dbus-sys=<dir>   where D-BUS system.d directory is])
+
+if ! test -z "$with_dbus_sys" ; then
+    DBUS_SYS_DIR="$with_dbus_sys"
+else
+    DBUS_SYS_DIR="$SYSCONFDIR/dbus-1/system.d"
+fi
+AC_SUBST(DBUS_SYS_DIR)
+AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
+
 AC_OUTPUT([
 Makefile
 src/Makefile

info-daemon/Makefile.am

@@ -1,24 +1,30 @@
-gladedir = $(datadir)/NetworkManagerInfo/glade
 
-INCLUDES =										\
-	$(NM_CFLAGS)									\
-	$(GLADE_CFLAGS)								\
-	$(GCONF_CFLAGS)								\
-	-Wall										\
-	-DDBUS_API_SUBJECT_TO_CHANGE						\
-	-DG_DISABLE_DEPRECATED							\
-	-DGTK_DISABLE_DEPRECATED							\
+INCLUDES =							\
+	$(NM_CFLAGS)						\
+	$(GLADE_CFLAGS)						\
+	$(GCONF_CFLAGS)						\
+	-Wall							\
+	-DDBUS_API_SUBJECT_TO_CHANGE				\
+	-DG_DISABLE_DEPRECATED					\
+	-DGTK_DISABLE_DEPRECATED				\
 	-DGLADEDIR=\""$(datadir)/NetworkManagerInfo/glade"\"	\
-	-DBINDIR=\"$(bindir)\"							\
+	-DBINDIR=\"$(bindir)\"					\
 	-DDATADIR=\"$(datadir)\"
 
 bin_PROGRAMS = NetworkManagerInfo
 
-NetworkManagerInfo_SOURCES =	NetworkManagerInfo.c			\
-						NetworkManagerInfoDbus.c
+NetworkManagerInfo_SOURCES =	NetworkManagerInfo.h		\
+				NetworkManagerInfo.c		\
+				NetworkManagerInfoDbus.h	\
+				NetworkManagerInfoDbus.c
 
 NetworkManagerInfo_LDADD = $(NM_LIBS) $(GLADE_LIBS) $(GCONF_LIBS)
 
+gladedir = $(datadir)/NetworkManagerInfo/glade
 glade_DATA = passphrase.glade keyring.png
 
-EXTRA_DIST = $(glade_DATA)
+dbusservicedir=$(DBUS_SYS_DIR)
+dbusservice_DATA = NetworkManagerInfo.conf
+
+EXTRA_DIST = $(glade_DATA) $(dbusservice_DATA)
+

src/Makefile.am

@@ -1,4 +1,3 @@
-EXTRA_DIST = NetworkManager.conf
 
 INCLUDES = 						\
 	$(NM_CFLAGS) 			   		\
@@ -31,6 +30,7 @@ NetworkManager_SOURCES =				\
 
 NetworkManager_LDADD = $(NM_LIBS) $(IWLIB) $(OPENSSL_LIBS)
 
-dbusservicedir = $(sysconfdir)/dbus-1/system.d
+dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = NetworkManager.conf
 
+EXTRA_DIST = $(dbusservice_DATA)