diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-12-12 22:34:08 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-12-12 22:34:08 +0100 |
commit | c3c0f3d47e49ab6814d4de3ee41a0c5caf0265b9 (patch) | |
tree | d760b055988f14a5d579162e6f105fa983eeb688 | |
parent | 2ae2ff374ef549ed887e74becb4a9f9076b4a71b (diff) | |
parent | 01905caa58178302d2bc910893e09eeca81ef320 (diff) |
Merge commit 'flameeyes/master'
-rw-r--r-- | common/.gitignore | 5 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/common/.gitignore b/common/.gitignore index 4b1a47e..de8ddd7 100644 --- 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 519d73a..b6e44b3 100644 --- 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]) |