Merge commit 'flameeyes/master'

diff --git a/common/.gitignore b/common/.gitignore
index 4b1a47e6b4b8d4d077581b7f0f47b1dc4a8343f7..de8ddd7bbe42d403b2b7606b5ac63110790ed480 100644 (file)
--- a/common/.gitignore
+++ b/common/.gitignore
@@ -4,6 +4,11 @@ iconv.m4
 lib-ld.m4
 lib-link.m4
 lib-prefix.m4
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
 nls.m4
 po.m4
 progtest.m4

diff --git a/configure.ac b/configure.ac
index 519d73afdd765ed96313656afdb22f8a6536fc04..b6e44b3ea715c37383e4d36e9ca0949a2ef83c73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -299,7 +299,7 @@ test_gcc_flag() {
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
 
-    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline -fPIC"
+    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline"
 
     if test "x$HAVE_NETLINK" = "xyes" ; then
         # Test whether rtnetlink.h can be included when compiled with -std=c99
@@ -404,8 +404,6 @@ if test "x$have_kqueue" = "xyes" ; then
     AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
 fi
 
-AM_GNU_GETTEXT([external])
-
 IT_PROG_INTLTOOL([0.35.0])
 GETTEXT_PACKAGE=avahi
 AC_SUBST([GETTEXT_PACKAGE])