X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=34b57896eb72b12e5f7ab5ecec8ec2820e36e213;hb=a48e94008dd33abc4f4b07012155e48f977a2e45;hp=4ae51729d2b4533cdbcf318e54e55d8fcc17688b;hpb=05b0b1d0aad6b9613fff841000815a05486f130b;p=catta

diff --git a/configure.ac b/configure.ac
index 4ae5172..34b5789 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,10 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.1],[mzninuv (at) 0pointer (dot) de])
-AC_CONFIG_SRCDIR([avahi-core])
+AC_INIT([avahi],[0.1],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_CONFIG_SRCDIR([avahi-core/server.c])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign -Wall])
+AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi])
 
@@ -71,7 +71,7 @@ AC_SUBST(GLIB20_CFLAGS)
 AC_SUBST(GLIB20_LIBS)
 
 AC_ARG_ENABLE(gtk,
-        AC_HELP_STRING([--enable-gtk],[use GTK+ (default=yes)]),
+        AS_HELP_STRING(--disable-gtk,Use GTK+ (default=yes)),
         [case "${enableval}" in
                 yes) ENABLE_GTK=yes ;;
                 no)  ENABLE_GTK=no ;;
@@ -90,31 +90,52 @@ if test "x$ENABLE_GTK" = "xyes"; then
         AC_SUBST(GLADE20_CFLAGS)
         AC_SUBST(GLADE20_LIBS)
 
-	DATADIRNAME=share
-	if test "x${prefix}" = "xNONE"; then
-	   interfacesdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/"
-	else
-	   interfacesdir="${prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/"
-	fi
-	AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${interfacesdir}", [path where glade files will be installed])
+	interfacesdir="${datadir}/${PACKAGE}/interfaces/"
 	AC_SUBST(interfacesdir)
 
 fi
 AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes")
 
-AC_ARG_ENABLE(doxygen,
-        AC_HELP_STRING([--enable-doxygen],[use doxygen to generate API docs (default=yes)]),
-        [case "${enableval}" in
-                yes) ENABLE_DOXYGEN=yes ;;
-                no)  ENABLE_DOXYGEN=no ;;
-                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;;
-        esac],
-        [ENABLE_DOXYGEN=yes]) dnl Default value
+#
+# Doxygen
+#
+DX_HTML_FEATURE(ON)
+DX_CHM_FEATURE(OFF)
+DX_CHI_FEATURE(OFF)
+DX_MAN_FEATURE(OFF)
+DX_RTF_FEATURE(OFF)
+DX_XML_FEATURE(OFF)
+DX_PDF_FEATURE(OFF)
+DX_PS_FEATURE(OFF)
+DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen)
+
+#
+# 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)
+
+   if test x$have_xmltoman = xno ; then
+     AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***])
+     xmltoman=no
+   fi
+fi
 
-AM_CONDITIONAL(ENABLE_DOXYGEN, test "x$ENABLE_DOXYGEN" = "xyes")
+AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
 
+#
+# D-BUS
+#
 AC_ARG_ENABLE(dbus,
-        AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
+        AS_HELP_STRING(--disable-dbus,Enable DBUS support (default=no)),
         [case "${enableval}" in
                 yes) ENABLE_DBUS=yes ;;
                 no)  ENABLE_DBUS=no ;;
@@ -135,7 +156,6 @@ if test "x$ENABLE_DBUS" = "xyes"; then
 	   DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
 	fi
 	AC_SUBST(DBUS_SYS_DIR)
-	AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, `eval echo $DBUS_SYS_DIR` , [Where system.d dir for DBUS is])
 
         AC_SUBST(DBUS_CFLAGS)
 	AC_SUBST(DBUS_LIBS)
@@ -143,12 +163,18 @@ fi
 
 AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" = "xyes")
 
+#
+# Expat
+#
 AC_CHECK_LIB(expat, XML_ParserCreate, [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ], have_expat=false)
 
 if ! $have_expat ; then
    AC_MSG_ERROR([*** libexpat not found ***])
 fi
 
+#
+# LibDaemon
+#
 PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.5 ])
 AC_SUBST(LIBDAEMON_CFLAGS)
 AC_SUBST(LIBDAEMON_LIBS)
@@ -165,7 +191,7 @@ fi
 #
 # Detecting the linux distro for specific things like initscripts.
 #
-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware]))
+AC_ARG_WITH(distro, AS_HELP_STRING(--with-distro=DISTRO,Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware))
 if test "z$with_distro" = "z"; then
    AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
    AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
@@ -181,11 +207,10 @@ if test "z$with_distro" = "z"; then
    exit 1
 else
 case $with_distro in
-   debian|gentoo)
+   debian|gentoo|suse)
      ;;
    *)
-     echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
-     exit 1
+     echo "Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)"
      ;;
 esac
 
@@ -220,30 +245,58 @@ AC_DEFINE_UNQUOTED(AVAHI_GROUP,"$AVAHI_GROUP", [Group for Avahi])
 #
 # Avahi runtime dir
 #
-avahi_runtime_dir=`eval echo ${localstatedir}/run/avahi`
-AC_DEFINE_UNQUOTED(AVAHI_RUNTIME_DIR, "${avahi_runtime_dir}", [path where pid and socket will be stored])
-AC_DEFINE_UNQUOTED(AVAHI_SOCKET, "${avahi_runtime_dir}/socket", [path for avahi socket])
+avahi_runtime_dir="${localstatedir}/run"
+avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
+AC_SUBST(avahi_runtime_dir)
+AC_SUBST(avahi_socket)
+
+#
+# Python stuff
+#
+AC_ARG_ENABLE(python,
+	AS_HELP_STRING(--disable-python, Disable scripts that depends on python),
+	[case "${enableval}" in
+	      yes) use_python=yes ;;
+	      no)  use_python=no ;;
+	      *) AC_MSG_ERROR([bad value ${enableval} for --disable-python]) ;;
+	esac],[use_python=yes])
+
+HAVE_PYTHON=no
+if test "x$use_python" = xyes ; then
+   AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
+
+   if  test "x$HAVE_PYTHON" = xyes ; then
+       AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(could not find pygtk module)])
+       AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(could not find python dbus module)])
+   fi
+fi
 
+AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ])
 
+# ==========================================================================
 AC_CONFIG_FILES([
 Makefile 
 avahi-core.pc 
-doxygen/Makefile 
-doxygen/doxygen.conf 
 avahi-common/Makefile 
 avahi-core/Makefile 
 avahi-daemon/Makefile 
 avahi-daemon/avahi-dbus.conf
-avahi-discover/Makefile 
+avahi-discover-standalone/Makefile 
 avahi-client/Makefile 
 initscript/Makefile 
 initscript/Debian/Makefile
 initscript/Gentoo/Makefile
+initscript/SUSE/Makefile
 avahi-dnsconfd/Makefile
+avahi-utils/Makefile
+avahi-utils/avahi/Makefile
+examples/Makefile
+common/Makefile
+man/Makefile
 ])
 AC_OUTPUT
 
-dnl ==========================================================================
+# ==========================================================================
 echo "
  ---{ $PACKAGE_NAME $VERSION }---
 
@@ -253,6 +306,9 @@ echo "
     dbus-1 version:         `pkg-config dbus-1 --modversion`
     compiler:               ${CC}
     cflags:                 ${CFLAGS}
+    Enable Gtk:             ${ENABLE_GTK}
+    Enable DBUS:            ${ENABLE_DBUS}
+    Have Python:            ${HAVE_PYTHON}
     Linux Distro:           ${with_distro}
     User for Avahi:         ${AVAHI_USER}
     Group for Avahi:        ${AVAHI_GROUP}