/cpw/tomkiewicz/masterpassword: 4d77a1d4675a: Keyring buildsyste...

[Tomasz Wasilczyk]

Changeset: 4d77a1d4675adcd2a2a29bfa0a53da652b8315b3
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-03-18 18:04 +0100
Branch:	 soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/4d77a1d4675a

Description:

Keyring buildsystem improvements: fix kwallet.moc generation, don't require gnome keyring build by default

diffstat:

 configure.ac                           |  3 +--
 libpurple/plugins/keyrings/Makefile.am |  6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1557,9 +1557,8 @@ dnl ####################################
 dnl # Check for GNOME Keyring headers
 dnl #######################################################################
 
-AC_ARG_ENABLE(gnome-keyring, [AC_HELP_STRING([--disable-gnome-keyring], [disable GNOME Keyring support])], enable_gnome_keyring=$enableval, enable_gnome_keyring=yes)
+AC_ARG_ENABLE(gnome-keyring, [AC_HELP_STRING([--enable-gnome-keyring], [enable GNOME Keyring support])], enable_gnome_keyring=$enableval, enable_gnome_keyring=no)
 
-dnl Check for gnome-keyring.h; if we don't have it, oh well
 if test "x$enable_gnome_keyring" = "xyes" ; then
 	PKG_CHECK_MODULES(GNOMEKEYRING, [gnome-keyring-1], [
 		AC_SUBST(GNOMEKEYRING_CFLAGS)
diff --git a/libpurple/plugins/keyrings/Makefile.am b/libpurple/plugins/keyrings/Makefile.am
--- a/libpurple/plugins/keyrings/Makefile.am
+++ b/libpurple/plugins/keyrings/Makefile.am
@@ -34,8 +34,10 @@ kwallet_la_SOURCES = kwallet.cpp
 kwallet_la_BUILTSOURCES = kwallet.moc
 kwallet_la_LIBADD  = $(GLIB_LIBS) $(KWALLET_LIBS) $(QT4_LIBS)
 
-kwallet.moc: kwallet.cpp
-	$(AM_V_GEN)$(MOC) $(kwallet_la_CXXFLAGS) -i $< -o $@
+kwallet.cpp: kwallet.moc
+
+kwallet.moc:
+	$(AM_V_GEN)$(MOC) $(kwallet_la_CXXFLAGS) -i kwallet.cpp -o $@
 
 endif