X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=5da0054ed1deb2822f56ebe7ae3472e7824ea39e;hb=61eb92b1ba30fd4da9be7e9dc9714125c1576cca;hp=2bbea03ba58b478bf73771a6c0fbbf6c9241c2f1;hpb=9f9f4f6ea2405edc642d322c19f6f13e31920046;p=catta diff --git a/configure.ac b/configure.ac index 2bbea03..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=