fPIC fix

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8cb6f2a61adf745aa42967d809bf10e6c3e4f4f6..cc66f6d0b8d9df18a0b111f4e3ea0059993a960c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.1],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.2],[avahi (at) lists (dot) freedesktop (dot) org])
 AC_CONFIG_SRCDIR([avahi-core/server.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
@@ -53,7 +53,7 @@ AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the Linux dis
 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/arch-version,with_distro="archlinux")
+   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:]]' `
@@ -63,7 +63,7 @@ if test "z$with_distro" = "z"; then
    exit 1
 else
 case $with_distro in
-   debian|arch)
+   debian|archlinux)
      ;;
    *)
      echo "Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)"
@@ -92,7 +92,7 @@ if test "x$GCC" = "xyes" ; then
 
    # 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
+   if test x"$with_distro" != xarchlinux ; then
        DESIRED_FLAGS="$DESIRED_FLAGS -std=c99"
    fi
 
@@ -326,6 +326,10 @@ if test x$xmltoman = xyes ; then
    AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no)
 
    if test x$have_xmltoman = xno ; then
+     if ! test -e man/avahi-daemon.8 ; then
+        AC_MSG_ERROR([*** xmltoman was not found, it is required to build the manpages and they have not been pre-built])
+        exit 1
+     fi
      AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***])
      xmltoman=no
    fi
@@ -344,7 +348,8 @@ avahi-daemon/avahi-dbus.conf
 avahi-discover-standalone/Makefile 
 avahi-client/Makefile 
 initscript/Makefile 
-initscript/Debian/Makefile
+initscript/debian/Makefile
+initscript/archlinux/Makefile
 avahi-dnsconfd/Makefile
 avahi-utils/Makefile
 avahi-utils/avahi/Makefile