X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=5da0054ed1deb2822f56ebe7ae3472e7824ea39e;hb=61eb92b1ba30fd4da9be7e9dc9714125c1576cca;hp=a141ad6822592851260635639996daec5315f1a1;hpb=99ad32213bca66d3350de6bbb0ef69102eb2fd7b;p=catta diff --git a/configure.ac b/configure.ac index a141ad6..5da0054 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ(2.57) AC_INIT([avahi],[0.1],[mzninuv (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([avahi-core]) 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]) @@ -35,10 +35,12 @@ fi # Checks for programs. AC_PROG_CC +AC_GNU_SOURCE AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +AC_PROG_GCC_TRADITIONAL # libtool stuff AC_PROG_LIBTOOL @@ -51,11 +53,12 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stdlib.h AC_C_CONST AC_TYPE_SIZE_T AC_HEADER_TIME +AC_HEADER_SYS_WAIT # Checks for library functions. AC_FUNC_MEMCMP AC_FUNC_SELECT_ARGTYPES -AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strerror strrchr strstr uname setresuid setreuid]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid]) AC_FUNC_CHOWN AC_FUNC_STAT @@ -68,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(--enable-gtk,use GTK+ (default=yes)), [case "${enableval}" in yes) ENABLE_GTK=yes ;; no) ENABLE_GTK=no ;; @@ -87,33 +90,30 @@ if test "x$ENABLE_GTK" = "xyes"; then AC_SUBST(GLADE20_CFLAGS) AC_SUBST(GLADE20_LIBS) - DATADIRNAME=share - if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/", [path where glade files will be installed]) - interfacesdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/" - AC_SUBST(interfacesdir) - else - AC_DEFINE_UNQUOTED(INTERFACES_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/", [path where glade files will be installed]) - interfacesdir="${prefix}/${DATADIRNAME}/${PACKAGE}/interfaces/" - AC_SUBST(interfacesdir) - fi + 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 - -AM_CONDITIONAL(ENABLE_DOXYGEN, test "x$ENABLE_DOXYGEN" = "xyes") +# +# 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) +# +# D-BUS +# AC_ARG_ENABLE(dbus, - AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]), + AS_HELP_STRING(--enable-dbus,use DBus (default=yes)), [case "${enableval}" in yes) ENABLE_DBUS=yes ;; no) ENABLE_DBUS=no ;; @@ -124,7 +124,7 @@ AC_ARG_ENABLE(dbus, 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.23]) + PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.30]) AC_ARG_WITH(dbus-sys, [ --with-dbus-sys= where D-BUS system.d directory is]) @@ -134,11 +134,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, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is]) - - if pkg-config dbus-1 --atleast-version=0.30 ; then - AC_DEFINE(DBUS_USE_NEW_API, 1, [Whether to use the new API for DBUS 0.30]) - fi AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -146,12 +141,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) @@ -168,7 +169,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") @@ -184,13 +185,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 @@ -222,27 +220,44 @@ fi AC_SUBST(AVAHI_GROUP) AC_DEFINE_UNQUOTED(AVAHI_GROUP,"$AVAHI_GROUP", [Group for Avahi]) +# +# Avahi runtime dir +# +avahi_runtime_dir="${localstatedir}/run" +avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket" +AC_SUBST(avahi_runtime_dir) +AC_SUBST(avahi_socket) + +# +# Python stuff +# +AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no]) +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/Debian/75avahi initscript/Gentoo/Makefile -initscript/Gentoo/avahi +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 }--- @@ -252,6 +267,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}