X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=f27a959a1fcaa60e9b2a9d31b9ac3e14173f9845;hb=9a5c4c803767ad7eaf77bac16a3c02bd14a4ce43;hp=65d771f354f670f5fe3b16d30a631fb74422b239;hpb=c38b02743d3a21112947af6689f34c1f00853c05;p=catta
diff --git a/configure.ac b/configure.ac
index 65d771f..f27a959 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 ;;
@@ -96,6 +96,9 @@ if test "x$ENABLE_GTK" = "xyes"; then
fi
AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes")
+#
+# Doxygen
+#
DX_HTML_FEATURE(ON)
DX_CHM_FEATURE(OFF)
DX_CHI_FEATURE(OFF)
@@ -106,8 +109,33 @@ 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([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 ;;
@@ -120,7 +148,7 @@ if test "x$ENABLE_DBUS" = "xyes"; then
AC_DEFINE(ENABLE_DBUS, 1, [Whether to use DBUS or not])
PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.30])
- AC_ARG_WITH(dbus-sys, [ --with-dbus-sys=
where D-BUS system.d directory is])
+ AC_ARG_WITH(dbus-sys, AS_HELP_STRING([--with-dbus-sys=], [where D-BUS system.d directory is]))
if ! test -z "$with_dbus_sys" ; then
DBUS_SYS_DIR="$with_dbus_sys"
@@ -135,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)
@@ -157,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")
@@ -190,7 +224,7 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
#
# Defining Avahi User and Group.
#
-AC_ARG_WITH(avahi_user,[ --with-avahi-user= User for running the Avahi daemon (avahi)])
+AC_ARG_WITH(avahi_user, AS_HELP_STRING([--with-avahi-user=],[User for running the Avahi daemon (avahi)]))
if test -z "$with_avahi_user" ; then
AVAHI_USER=avahi
else
@@ -199,7 +233,7 @@ fi
AC_SUBST(AVAHI_USER)
AC_DEFINE_UNQUOTED(AVAHI_USER,"$AVAHI_USER", [User for running the Avahi daemon])
-AC_ARG_WITH(avahi_group,[ --with-avahi-group= Group for Avahi (avahi)])
+AC_ARG_WITH(avahi_group,AS_HELP_STRING([--with-avahi-group=],[Group for Avahi (avahi)]))
if test -z "$with_avahi_group" ; then
AVAHI_GROUP=avahi
else
@@ -216,9 +250,30 @@ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
AC_SUBST(avahi_runtime_dir)
AC_SUBST(avahi_socket)
-AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
+#
+# 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
@@ -226,7 +281,7 @@ 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
@@ -235,15 +290,13 @@ initscript/SUSE/Makefile
avahi-dnsconfd/Makefile
avahi-utils/Makefile
avahi-utils/avahi/Makefile
-avahi-utils/avahi-dump-all
-avahi-utils/avahi-publish-service
-avahi-utils/avahi-publish-address
-avahi-utils/avahi-discover
examples/Makefile
+common/Makefile
+man/Makefile
])
AC_OUTPUT
-dnl ==========================================================================
+# ==========================================================================
echo "
---{ $PACKAGE_NAME $VERSION }---