X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=be62e38b37f0a4cdd829262e4cc91e1155f73e7d;hb=b3983d0f5f70c6fe02f6eb4e190417f018b5474a;hp=cc66f6d0b8d9df18a0b111f4e3ea0059993a960c;hpb=386c9428d669750dfa4a69005b0cb66f8dcd28ba;p=catta

diff --git a/configure.ac b/configure.ac
index cc66f6d..be62e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,36 +47,35 @@ AC_PROG_GCC_TRADITIONAL
 AC_PROG_LIBTOOL
 
 #
-# Detecting the linux distro for specific things like initscripts.
+# Detecting the linux distribution for specific things like init scripts.
 #
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the Linux distribution to target: One of debian, archlinux or none]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the Linux distribution to target: One of debian, gentoo, archlinux or none]))
 if test "z$with_distro" = "z"; then
    #AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-   #AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
+   AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
    AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
    AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
 fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
 
 if test "z$with_distro" = "z"; then
-   echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO"
+   AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO])
    exit 1
 else
 case $with_distro in
-   debian|archlinux)
+   debian|gentoo|archlinux)
      ;;
    *)
-     echo "Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)"
+     AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)])
      ;;
 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)
 
-
 test_gcc_flag() {
    AC_LANG_CONFTEST([int main() {}])
    $CC -c conftest.c $CFLAGS $@ > /dev/null 2> /dev/null
@@ -87,24 +86,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
+    AC_MSG_CHECKING([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"
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([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.
@@ -349,6 +360,7 @@ avahi-discover-standalone/Makefile
 avahi-client/Makefile 
 initscript/Makefile 
 initscript/debian/Makefile
+initscript/gentoo/Makefile
 initscript/archlinux/Makefile
 avahi-dnsconfd/Makefile
 avahi-utils/Makefile