summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sdroege@src.gnome.org>2007-09-29 05:03:31 +0000
committerSebastian Dröge <sdroege@src.gnome.org>2007-09-29 05:03:31 +0000
commit1aa8066a4f4f03133eb032f2f4816a3f4de64bb5 (patch)
treea069dd039b6c0c3e25d393b850c2648b871c140e
parentc058b80f0fd76f36bec9f7fb1f167d48d9d81cc5 (diff)
downloadgvfs-1aa8066a4f4f03133eb032f2f4816a3f4de64bb5.tar.gz
Update to the new pkg-config filename. Remove pkg-config file that belongs
* configure.ac: Update to the new pkg-config filename. * gio-standalone.pc.in: Remove pkg-config file that belongs to gio. svn path=/trunk/; revision=964
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac5
-rw-r--r--gio-standalone.pc.in11
3 files changed, 7 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index c668a6a4..afe6db78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-29 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * configure.ac: Update to the new pkg-config filename.
+ * gio-standalone.pc.in: Remove pkg-config file that belongs to gio.
+
2007-09-27 Sebastian Dröge <slomo@circular-chaos.org>
* daemon/gvfsbackendftp.c: (do_replace), (do_query_info),
diff --git a/configure.ac b/configure.ac
index fafe3ac9..4536c878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,11 +39,11 @@ GTK_DOC_CHECK
DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.13.8 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-standalone)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.13.8 gthread-2.0 gobject-2.0 gmodule-no-export-2.0 gio-2.0)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
-PKG_CHECK_MODULES(DBUS, dbus-1)
+PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-main-1)
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
@@ -229,7 +229,6 @@ client/Makefile
daemon/Makefile
test/Makefile
po/Makefile.in
-gio-standalone.pc
])
echo
diff --git a/gio-standalone.pc.in b/gio-standalone.pc.in
deleted file mode 100644
index 2997e79d..00000000
--- a/gio-standalone.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GIO
-Description: GNOME virtual I/O
-Version: @VERSION@
-Requires: gobject-2.0,gmodule-no-export-2.0
-Libs: -L${libdir} -lgio
-Cflags: -I${includedir}/