X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=ecc112081b674a75025648ed5e23e584aadde154;hb=2a2ee0be70b99239f2cf99ea5b663eda965599f8;hp=e58102cad2c23b1263897c62c1e4fa13a73c221a;hpb=558f1f36b83b04d19c3e26acdb699236484c96d5;p=catta

diff --git a/configure.ac b/configure.ac
index e58102c..ecc1120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,7 @@ if test "z$with_distro" = "z"; then
     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")
+    AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
 fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
 
@@ -129,7 +130,7 @@ if test "z$with_distro" = "z"; then
     exit 1
 else
 case $with_distro in
-    debian|gentoo|archlinux|suse|none)
+    debian|gentoo|archlinux|suse|fedora|none)
      ;;
     *)
      AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check])
@@ -141,6 +142,7 @@ AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 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)
+AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
 
 test_gcc_flag() {
     AC_LANG_CONFTEST([int main() {}])
@@ -213,7 +215,7 @@ AC_CHECK_DECLS(environ)
 # PKG_PROG_PKG_CONFIG macro won't be defined.
 AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
 
-if test x"$have_pkg_config" == xno; then
+if test x"$have_pkg_config" = "xno"; then
     AC_MSG_ERROR(pkg-config is required to install this program)
 fi
 
@@ -560,30 +562,43 @@ DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen)
 
 #
-# XMLTOMAN manpage generation
+# Build and Install man pages
 #
-AC_ARG_ENABLE(xmltoman,
-        AS_HELP_STRING([--disable-xmltoman],[Disable rebuilding of man pages with xmltoman]),
+AC_ARG_ENABLE(manpages,
+        AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]),
 [case "${enableval}" in
-  yes) xmltoman=yes ;;
-  no)  xmltoman=no ;;
-  *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;;
-esac],[xmltoman=yes])
-
-if test x$xmltoman = xyes ; then
-    AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no)
- 
-    if test x$have_xmltoman = xno ; then
+  yes) manpages=yes ;;
+  no)  manpages=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --disable-manpages]) ;;
+esac],[manpages=yes])
+
+if test x$manpages = xyes ; then
+    #
+    # XMLTOMAN manpage generation
+    #
+    AC_ARG_ENABLE(xmltoman,
+    AS_HELP_STRING([--disable-xmltoman],[Disable rebuilding of man pages with xmltoman]),
+    [case "${enableval}" in
+      yes) xmltoman=yes ;;
+      no)  xmltoman=no ;;
+      *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;;
+    esac],[xmltoman=yes])
+    
+    if test x$xmltoman = xyes ; then
+        AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no)
+    fi
+
+    if test x$have_xmltoman = xno -o x$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])
+            AC_MSG_ERROR([*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman])
             exit 1
         fi
         AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***])
         xmltoman=no
     fi
 fi
-
 AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
+AM_CONDITIONAL([BUILD_MANPAGES], [test "x$manpages" = xyes])
 
 #
 # Conditionally compile test and example programs
@@ -644,6 +659,7 @@ initscript/debian/Makefile
 initscript/gentoo/Makefile
 initscript/archlinux/Makefile
 initscript/suse/Makefile
+initscript/fedora/Makefile
 avahi-dnsconfd/Makefile
 avahi-utils/Makefile
 avahi-utils/avahi/Makefile