2007-08-13 Tambet Ingo <tambet@gmail.com>

        * libnm-glib/libnm-glib.pc.in: Rename to libnm_glib.pc.in.

        * libnm-glib/Makefile.am: Add legacy libnm_glib.[ch] to the
        * build.
        Rename the library from libnm-glib to libnm_glib to maintain the
library API
        compatibility with 0.6 branch.

        * Makefile.am: Remove gnome/ SUBDIR.

        * gnome/libnm_glib/libnm_glib.[ch]: Move to libnm-glib/.

        * src/Makefile.am: Remove the WPA_SUPPLICANT_BIN define.

        * dispatcher-daemon/Makefile.am: Link the binary with
        * libnm_glib.

        * configure.in: Remove GNOME checks, NetworkManager does not
        * need any of these
        anymore.
        Remove checks for wpa_supplicant binary, it's used over dbus.
        Remove gnome/ directory files form AC_OUTPUT, that directory is
getting moved.

        * test/Makefile.am: Remove define WPA_SUPPLICANT_BIN.
        Link the binaries with libnm_glib.la.

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

diff --git a/ChangeLog b/ChangeLog
index e27fbfe..c83f82f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2007-08-13  Tambet Ingo  <tambet@gmail.com>
+
+       * libnm-glib/libnm-glib.pc.in: Rename to libnm_glib.pc.in.
+
+       * libnm-glib/Makefile.am: Add legacy libnm_glib.[ch] to the build.
+       Rename the library from libnm-glib to libnm_glib to maintain the library API
+       compatibility with 0.6 branch.
+
+       * Makefile.am: Remove gnome/ SUBDIR.
+
+       * gnome/libnm_glib/libnm_glib.[ch]: Move to libnm-glib/.
+
+       * src/Makefile.am: Remove the WPA_SUPPLICANT_BIN define.
+
+       * dispatcher-daemon/Makefile.am: Link the binary with libnm_glib.
+
+       * configure.in: Remove GNOME checks, NetworkManager does not need any of these
+       anymore.
+       Remove checks for wpa_supplicant binary, it's used over dbus.
+       Remove gnome/ directory files form AC_OUTPUT, that directory is getting moved.
+
+       * test/Makefile.am: Remove define WPA_SUPPLICANT_BIN.
+       Link the binaries with libnm_glib.la.
+
 2007-08-12  Dan Williams  <dcbw@redhat.com>
 
        * src/NetworkManagerPolicy.c

diff --git a/Makefile.am b/Makefile.am
index 7a72814..1d9d725 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS =                               \
           libnm-glib                   \
           src                          \
           dispatcher-daemon    \
-          gnome                                \
           initscript                   \
           test                         \
           po                           \
@@ -19,7 +18,7 @@ EXTRA_DIST =                          \
        intltool-extract.in             \
        intltool-merge.in               \
        intltool-update.in              
-       
+
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/configure.in b/configure.in
index 2d83cc5..31a20ea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,12 +43,6 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
-dnl
-dnl GNOME support
-dnl
-AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager without GNOME support, e.g. daemon only]))
-AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
-
 dnl
 dnl translation support
 dnl
@@ -170,33 +164,6 @@ PKG_CHECK_MODULES(HAL, hal >= 0.5.0)
 AC_SUBST(HAL_CFLAGS)
 AC_SUBST(HAL_LIBS)
 
-if test x"$with_gnome" != xno; then
-       PKG_CHECK_MODULES(GTK, gtk+-2.0)
-       AC_SUBST(GTK_CFLAGS)
-       AC_SUBST(GTK_LIBS)
-
-       PKG_CHECK_MODULES(GLADE, libglade-2.0)
-       AC_SUBST(GLADE_CFLAGS)
-       AC_SUBST(GLADE_LIBS)
-
-       PKG_CHECK_MODULES(GCONF, gconf-2.0)
-       AC_SUBST(GCONF_CFLAGS)
-       AC_SUBST(GCONF_LIBS)
-
-       PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
-       AC_SUBST(GNOME_KEYRING_CFLAGS)
-       AC_SUBST(GNOME_KEYRING_LIBS)
-
-       PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-       AC_SUBST(LIBGNOMEUI_CFLAGS)
-       AC_SUBST(LIBGNOMEUI_LIBS)
-
-       PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no])
-       if test "$have_libgnome_2_14" = "yes"; then
-               AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
-       fi
-fi
-
 PKG_CHECK_MODULES(LIBNL, libnl-1)
 AC_SUBST(LIBNL_CFLAGS)
 AC_SUBST(LIBNL_LIBS)
@@ -248,19 +215,6 @@ fi
 AC_DEFINE_UNQUOTED(DHCDBD_BINARY_PATH, "$DHCDBD_BINARY_PATH", [Define to path of dhcdbd binary])
 AC_SUBST(DHCDBD_BINARY_PATH)
 
-# wpa_supplicant binary path
-AC_ARG_WITH(wpa_supplicant, AC_HELP_STRING([--with-wpa_supplicant=/path/to/wpa_supplicant], [path to wpa_supplicant]))
-if test "x${with_wpa_supplicant}" = x; then
-  AC_PATH_PROG(WPA_SUPPLICANT_BINARY_PATH, wpa_supplicant, [], $PATH:/sbin:/usr/sbin)
-  if ! test -x "$WPA_SUPPLICANT_BINARY_PATH"; then
-        AC_MSG_ERROR(wpa_supplicant is not installed.  See http://hostap.epitest.fi/wpa_supplicant/)
-  fi
-else
-  WPA_SUPPLICANT_BINARY_PATH="$with_wpa_supplicant"
-fi
-AC_DEFINE_UNQUOTED(WPA_SUPPLICANT_BINARY_PATH, "$WPA_SUPPLICANT_BINARY_PATH", [Define to path of wpa_supplicant binary])
-AC_SUBST(WPA_SUPPLICANT_BINARY_PATH)
-
 # ip binary path
 AC_ARG_WITH(ip, AC_HELP_STRING([--with-ip=/path/to/ip], [path to ip])) 
 if test "x${with_ip}" = x; then
@@ -321,14 +275,10 @@ src/supplicant-manager/Makefile
 src/backends/Makefile
 libnm-util/libnm-util.pc
 libnm-util/Makefile
-libnm-glib/libnm-glib.pc
+libnm-glib/libnm_glib.pc
 libnm-glib/Makefile
 callouts/Makefile
 dispatcher-daemon/Makefile
-gnome/Makefile
-gnome/libnm_glib/libnm_glib.pc
-gnome/libnm_glib/Makefile
-gnome/vpn-properties/Makefile
 test/Makefile
 test/test-common/Makefile
 test/libnm-util/Makefile

diff --git a/dispatcher-daemon/Makefile.am b/dispatcher-daemon/Makefile.am
index df2ad7c..868bbd1 100644 (file)
--- a/dispatcher-daemon/Makefile.am
+++ b/dispatcher-daemon/Makefile.am
@@ -28,7 +28,7 @@ NetworkManagerDispatcher_CFLAGS =             \
 NetworkManagerDispatcher_LDADD =               \
        $(top_builddir)/utils/libnmutils.la     \
        $(top_builddir)/libnm-util/libnm-util.la\
-       $(top_builddir)/libnm-glib/libnm-glib.la\
+       $(top_builddir)/libnm-glib/libnm_glib.la\
        $(DBUS_LIBS)                            \
        $(GTHREAD_LIBS)                         \
        $(NULL)

diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index f2d6689..20e1e60 100644 (file)
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -11,10 +11,11 @@ BUILT_SOURCES = \
        nm-settings-connection-glue.h \
        nm-settings-glue.h
 
-lib_LTLIBRARIES = libnm-glib.la
+lib_LTLIBRARIES = libnm_glib.la
 
 libnm_glib_la_CFLAGS =                 \
        $(GLIB_CFLAGS)          \
+       $(GTHREAD_CFLAGS)       \
        $(DBUS_CFLAGS)          \
        $(GCONF_CFLAGS)         \
        $(GNOME_KEYRING_CFLAGS)
@@ -22,6 +23,7 @@ libnm_glib_la_CFLAGS =                \
 libnmincludedir = $(includedir)/libnm-glib
 
 libnminclude_HEADERS = \
+       libnm_glib.h            \
        nm-object.h             \
        nm-client.h             \
        nm-device.h             \
@@ -33,6 +35,7 @@ libnminclude_HEADERS = \
        nm-vpn-connection.h
 
 libnm_glib_la_SOURCES = \
+       libnm_glib.c            \
        nm-object.c             \
        nm-client.c             \
        nm-device.c             \
@@ -48,6 +51,7 @@ libnm_glib_la_SOURCES = \
 libnm_glib_la_LIBADD = \
        $(top_builddir)/libnm-util/libnm-util.la        \
        $(GLIB_LIBS)                                    \
+       $(GTHREAD_LIBS)                                 \
        $(DBUS_LIBS)                                    \
        $(GCONF_LIBS)                                   \
        $(GNOME_KEYRING_LIBS)
@@ -56,7 +60,7 @@ noinst_PROGRAMS = libnm-glib-test
 
 libnm_glib_test_SOURCES = libnm-glib-test.c
 libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
+libnm_glib_test_LDADD = libnm_glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 
 nm-marshal.h: Makefile.am nm-marshal.list
        $(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \
@@ -94,11 +98,11 @@ nm-settings-connection-glue.h: $(top_srcdir)/introspection/nm-settings-connectio
        dbus-binding-tool --prefix=nm_connection_settings --mode=glib-server --output=nm-settings-connection-glue.h $(top_srcdir)/introspection/nm-settings-connection.xml
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libnm-glib.pc
+pkgconfig_DATA = libnm_glib.pc
 
-DISTCLEANFILES = libnm-glib.pc
+DISTCLEANFILES = libnm_glib.pc
 
-EXTRA_DIST = libnm-glib.pc.in nm-marshal.list
+EXTRA_DIST = libnm_glib.pc.in nm-marshal.list
 
 CLEANFILES = \
        $(BUILT_SOURCES)

diff --git a/gnome/libnm_glib/libnm_glib.c b/libnm-glib/libnm_glib.c
similarity index 100%
rename from gnome/libnm_glib/libnm_glib.c
rename to libnm-glib/libnm_glib.c

diff --git a/gnome/libnm_glib/libnm_glib.h b/libnm-glib/libnm_glib.h
similarity index 93%
rename from gnome/libnm_glib/libnm_glib.h
rename to libnm-glib/libnm_glib.h
index 17d050b..6f577e4 100644 (file)
--- a/gnome/libnm_glib/libnm_glib.h
+++ b/libnm-glib/libnm_glib.h
@@ -22,11 +22,11 @@
 #ifndef _LIB_NM_H_
 #define _LIB_NM_H_
 
+#ifndef NM_DISABLE_DEPRECATED
+
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 typedef enum libnm_glib_state
 {
@@ -51,8 +51,8 @@ libnm_glib_state       libnm_glib_get_network_state           (const libnm_glib_ctx *ctx);
 guint                           libnm_glib_register_callback           (libnm_glib_ctx *ctx, libnm_glib_callback_func func, gpointer user_data, GMainContext *g_main_ctx);
 void                            libnm_glib_unregister_callback (libnm_glib_ctx *ctx, guint id);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
+
+#endif /* NM_DISABLE_DEPRECATED */
 
-#endif
+#endif /* _LIB_NM_H_ */

diff --git a/libnm-glib/libnm-glib.pc.in b/libnm-glib/libnm_glib.pc.in
similarity index 90%
rename from libnm-glib/libnm-glib.pc.in
rename to libnm-glib/libnm_glib.pc.in
index c4de4b7..04b623e 100644 (file)
--- a/libnm-glib/libnm-glib.pc.in
+++ b/libnm-glib/libnm_glib.pc.in
@@ -8,6 +8,6 @@ Description: Convenience library for clients of NetworkManager
 Version: @VERSION@
 Requires: NetworkManager >= 0.7.0 
 Cflags: -I${includedir}/libnm-glib
-Libs: -L${libdir} -lnm-glib
+Libs: -L${libdir} -lnm_glib
 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 516800e..d5885e0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,7 +126,6 @@ NetworkManager_CPPFLAGS =                                                   \
        $(HAL_CFLAGS)                                                                   \
        $(OPENSSL_CFLAGS)                                                               \
        $(LIBNL_CFLAGS)                                                         \
-       -DWPA_SUPPLICANT_BIN=\"$(WPA_SUPPLICANT_BINARY_PATH)\"  \
        -DDBUS_API_SUBJECT_TO_CHANGE                                            \
        -DG_DISABLE_DEPRECATED                                                  \
        -DBINDIR=\"$(bindir)\"                                                  \

diff --git a/test/Makefile.am b/test/Makefile.am
index 8f7a03c..cf25cf4 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS =                                         \
        $(HAL_CFLAGS)                                   \
        -DDBUS_API_SUBJECT_TO_CHANGE            \
        -DBINDIR=\"$(bindir)\"                  \
-       -DWPA_SUPPLICANT_BIN=\"$(WPA_SUPPLICANT_BINARY_PATH)\"  \
        -DNM_RUN_DIR=\"$(rundir)\" \
        -DDATADIR=\"$(datadir)\"
 
@@ -25,7 +24,7 @@ noinst_PROGRAMS = nm-tool \
 
 nm_tool_SOURCES = nm-tool.c
 nm_tool_LDADD =        $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS)        \
-               $(top_builddir)/libnm-glib/libnm-glib.la \
+               $(top_builddir)/libnm-glib/libnm_glib.la \
                $(top_builddir)/libnm-util/libnm-util.la
 
 nm_online_SOURCES = nm-online.c
@@ -42,8 +41,8 @@ nmtestdevices_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS)    \
 
 libnm_glib_test_SOURCES = libnm_glib_test.c
 libnm_glib_test_LDADD =        $(DBUS_LIBS) $(GTHREAD_LIBS) \
+                       $(top_builddir)/libnm-glib/libnm_glib.la \
                        $(top_builddir)/utils/libnmutils.la \
-                       $(top_builddir)/gnome/libnm_glib/libnm_glib.la \
                        $(top_builddir)/libnm-util/libnm-util.la
 
 nm_supplicant_test_SOURCES = nm-supplicant-test.c