add -Wno-deprecated. Add 2 patches from Páder Rezső

diff --git a/autogen.sh b/autogen.sh
index 44d99bdd469b4f3988e0704c7bfa211effbfffc7..068589991ffc20046a78d63113e8b92123b8f918 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,5 +17,8 @@ aclocal -I m4 \
   && libtoolize --force --copy \
   && autoheader \
   && automake --add-missing --gnu --copy \
-  && autoconf \
-  && ./configure --enable-maintainer-mode $@
+  && autoconf
+  
+if test -z "$NOCONFIGURE"; then
+  exec ./configure --enable-maintainer-mode $@
+fi

diff --git a/configure.ac b/configure.ac
index 65e33dc8365e179853f1b72171fd6149c963827e..c2e8a6e59e0028fa28220b1175ad039c46e6f70c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,9 @@ if test "x$prefix" = "xNONE"; then
        prefix=$ac_default_prefix
 fi
 if test "x$enable-maintainer-mode" = "x"; then
-    CFLAGS="-g -Wall -O -O2 -Wno-unused-variable -Wno-uninitialized"
+    CFLAGS="-g -Wall -O -O2 -Wno-unused-variable -Wno-uninitialized -Wno-deprecated"
 else
-    CFLAGS="-g -Wall"
+    CFLAGS="-g -Wno-deprecated -Wall"
 fi
 BINDIR="${prefix}/bin"
 AC_DEFINE_UNQUOTED(BINDIR, "$BINDIR", [Where is binary installed])
@@ -152,6 +152,7 @@ else
 fi
 AC_DEFINE_UNQUOTED(DEBUG, $DEBUG_MODE, [Activate debug mode in source])
 
+EXTENSIONS="ldifexport ldifimport vcard"
 dnl --- Example extension ---
 AC_MSG_CHECKING([whether to build example extension])
 AC_ARG_ENABLE(example-extension,
@@ -299,12 +300,12 @@ $PACKAGE $VERSION
         Source code:\t${srcdir}
         Compiler:\t${CC} $($CC -dumpversion)
         CFLAGS:\t\t${CFLAGS}
-        Extension dir:\t${EXTENSIONDIR}
         Plugins:\t${PLUGINS}
         Plugin dir:\t${PLUGINDIR}
+        Extensions:\t${EXTENSIONS}
        Extension dir:\t${CLAWS_CONTACTS_EXTENSIONDIR}
         Debug mode:\t${DEBUG_MODE}
-        DBus client:\t${ac_cv_enable_dbus_client}
+        DBus test client:\t${ac_cv_enable_dbus_client}
 
         The binary will be installed in ${BINDIR}
 

diff --git a/src/dbus/dbus-service.c b/src/dbus/dbus-service.c
index c62edbe78f807c80a5dff85c8bcf74b4f1cab32c..0a19d83ec80b6d6360f99ae1fa790b50e3ce4383 100644 (file)
--- a/src/dbus/dbus-service.c
+++ b/src/dbus/dbus-service.c
@@ -53,7 +53,9 @@ int start_service(gboolean keep) {
     GError* error = NULL;
 
     /* Initialize the GType/GObject system. */
+#if !GLIB_CHECK_VERSION(2,35,0)
     g_type_init ();
+#endif
     DAEMON = TRUE;
     mainloop = NULL;
     DBusProxy = NULL;

diff --git a/src/dbus/server-object.c b/src/dbus/server-object.c
index 77f93db4f394bf57b53f1d4026e8ac61be869278..1ac72900ec3a166941529439a2e0bcf6c2d9520b 100644 (file)
--- a/src/dbus/server-object.c
+++ b/src/dbus/server-object.c
@@ -895,4 +895,4 @@ gboolean abook_get_vcard(ServerObject* server,
     }
     
     return response;
-}
\ No newline at end of file
+}