* Bump version number in configure.ac to 0.2

 * Move a few dir definitions in Makefile.am's do that autotools doesn't create empty directories
 * Uncomment AM_CONDITIONAL for TARGET_GENTOO which broke the build
 * Add missing introspect files to EXTRA_DIST in avahi-daemon/Makefile.am, makes
 distcheck pass again.
 * Remove the ugly archlinux specific -std=c99 hack
 * Replace it with a much more elegant test to see if rtnetlink.h will compile w
ith -std=c99 and disable it if it will not

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@417 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index f1f0d510ac1b426016fe72b531f74aa6a2bcacab..8c433d5ac8955f486751f19834458cba462b62c4 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -108,6 +108,9 @@ EXTRA_DIST = \
        DomainBrowser.introspect \
        ServiceTypeBrowser.introspect \
        ServiceBrowser.introspect \
+       ServiceResolver.introspect \
+       AddressResolver.introspect \
+       HostNameResolver.introspect \
        ssh.service \
        example.service \
        introspect.dtd \

diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am
index ce82d6849c33f81a10dc920102fde2f852d98149..d4abc81503220c23347796c875946999c2c325d7 100644 (file)
--- a/avahi-glib/Makefile.am
+++ b/avahi-glib/Makefile.am
@@ -22,10 +22,10 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-avahiincludedir=$(includedir)/avahi-glib
-
 if HAVE_GLIB
 
+avahiincludedir=$(includedir)/avahi-glib
+
 avahiinclude_HEADERS = \
        glib-watch.h \
        glib-malloc.h
@@ -49,4 +49,3 @@ glib_watch_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
 glib_watch_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(GLIB20_LIBS)
 
 endif
-

diff --git a/common/Makefile.am b/common/Makefile.am
index 1cbad833004843993c941c0b36302b105052640a..e51c02a8f768ff11a08c86e3e6e0ed7a87d307d8 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -18,6 +18,6 @@
 # USA.
 
 EXTRA_DIST = \
-        doxygen.m4 \
+    doxygen.m4 \
        doxygen.mk \
        python.m4

diff --git a/configure.ac b/configure.ac
index 993a4ea71c01f69d7833759c27776df7c45da5c2..2300100b64553336af2b467b2bfd018907c27389 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ esac
 fi
 
 #AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
-#AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
+AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 AM_CONDITIONAL(TARGET_ARCHLINUX, test x"$with_distro" = xarchlinux)
 
@@ -87,24 +87,36 @@ 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 -Wlarger-than-4000 -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter"
 
-   # Work around a kernel header bug in arch linux where rtnetlink.h
-   # can't be included with -std=c99
-   if test x"$with_distro" != xarchlinux ; then
-       DESIRED_FLAGS="$DESIRED_FLAGS -std=c99"
-   fi
-
-   for flag in $DESIRED_FLAGS ; do
-       AC_MSG_CHECKING([whether $CC accepts $flag])
-       if test_gcc_flag $flag ; then 
-          CFLAGS="$CFLAGS $flag"
-          AC_MSG_RESULT([yes])
-       else
-          AC_MSG_RESULT([no])
-       fi
-   done 
+    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 -Wlarger-than-4000 -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter"
+
+    # Test whether rtnetlink.h can be included when compiled with -std=c99
+    # some distributions (e.g. archlinux) have broken headers that dont
+    # define __u64 with -std=c99
+    echo -n "checking whether rtnetlink.h can be included with -std=c99... "
+    OLDCFLAGS="$CFLAGS"
+    CFLAGS="-std=c99"
+    AC_TRY_COMPILE([#include <linux/rtnetlink.h>], [],
+        use_stdc99=yes, use_stdc99=no)
+
+    if test x"$use_stdc99" = xyes; then
+        DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS"
+        echo "yes"
+    else
+        echo "no"
+    fi
+
+    CFLAGS="$OLDCFLAGS"
+
+    for flag in $DESIRED_FLAGS ; do
+        AC_MSG_CHECKING([whether $CC accepts $flag])
+        if test_gcc_flag $flag ; then 
+           CFLAGS="$CFLAGS $flag"
+           AC_MSG_RESULT([yes])
+        else
+           AC_MSG_RESULT([no])
+        fi
+    done 
 fi
 
 # Checks for header files.

diff --git a/initscript/suse/Makefile.am b/initscript/suse/Makefile.am
index 58d35dd7045a2b525df0843dcea790c060e741bc..3aa8431e29572f719ac0ad443f0f9cbb08fbad13 100644 (file)
--- a/initscript/suse/Makefile.am
+++ b/initscript/suse/Makefile.am
@@ -1,4 +1,6 @@
+if ENABLE_DBUS
 dbusinitddir = $(sysconfdir)/init.d
 dbusinitd_SCRIPTS = avahi-daemon
 
 EXTRA_DIST = $(dbusinitd_SCRIPTS)
+endif