X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=29182efa95521568cf2d0b43f4a9c08195cc095f;hb=f43187377e0c89ba02ca23e88efa01bbb255e037;hp=5d0cc76d94e93aa89855c94babfed31d7a27ba24;hpb=724242be451a3c82e51dee0981b0f41f5a265e53;p=catta diff --git a/configure.ac b/configure.ac index 5d0cc76..29182ef 100644 --- a/configure.ac +++ b/configure.ac @@ -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,14 +53,17 @@ 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 memset select socket strchr strcspn strerror uname]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid]) -AC_CHECK_FUNCS(setresuid) -AC_CHECK_FUNCS(setreuid) +AC_FUNC_CHOWN +AC_FUNC_STAT +AC_TYPE_MODE_T +AC_TYPE_PID_T # Check for GLIB 2.0 PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ]) @@ -85,30 +90,21 @@ 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") +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(ON) +DX_PS_FEATURE(OFF) +DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen-doc) AC_ARG_ENABLE(dbus, AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]), @@ -119,10 +115,10 @@ AC_ARG_ENABLE(dbus, esac], [ENABLE_DBUS=yes]) dnl Default value -AC_DEFINE(ENABLE_DBUS, 1, [Whether to use DBUS or not]) if test "x$ENABLE_DBUS" = "xyes"; then - PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.23]) + 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]) @@ -132,18 +128,9 @@ 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) - - 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 fi AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" = "xyes") @@ -186,11 +173,10 @@ if test "z$with_distro" = "z"; then exit 1 else case $with_distro in - debian) + 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,11 +208,19 @@ 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) + +AM_PATH_PYTHON(2.2) + AC_CONFIG_FILES([ Makefile avahi-core.pc -doxygen/Makefile -doxygen/doxygen.conf avahi-common/Makefile avahi-core/Makefile avahi-daemon/Makefile @@ -235,25 +229,33 @@ avahi-discover/Makefile avahi-client/Makefile initscript/Makefile initscript/Debian/Makefile -initscript/Debian/15avahi +initscript/Gentoo/Makefile +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 ]) AC_OUTPUT dnl ========================================================================== echo " - $PACKAGE_NAME $VERSION - ============ - - prefix: ${prefix} - sysconfdir: ${sysconfdir} - dbus-1 system.d dir: ${DBUS_SYS_DIR} - dbus-1 version: `pkg-config dbus-1 --modversion` - compiler: ${CC} - cflags: ${CFLAGS} - Linux Distro: ${with_distro} - User for Avahi: ${AVAHI_USER} - Group for Avahi: ${AVAHI_GROUP} + ---{ $PACKAGE_NAME $VERSION }--- + + prefix: ${prefix} + sysconfdir: ${sysconfdir} + dbus-1 system.d dir: ${DBUS_SYS_DIR} + dbus-1 version: `pkg-config dbus-1 --modversion` + compiler: ${CC} + cflags: ${CFLAGS} + Enable Gtk: ${ENABLE_GTK} + Enable Dbus: ${ENABLE_DBUS} + Linux Distro: ${with_distro} + User for Avahi: ${AVAHI_USER} + Group for Avahi: ${AVAHI_GROUP} + + NOTE: Remember to create user ${AVAHI_USER} and group ${AVAHI_GROUP} before make install " - -echo "NOTE: Remember to create user ${AVAHI_USER} and group ${AVAHI_GROUP} before make install" -echo