X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=99803ecdcb0051790dd7a6e45b4f70612fc4d3cc;hb=fe367caf27dd022258218a768da1ae2ddd246203;hp=3c554a93ebd59b1d4aa6d2a6eb4058237a198919;hpb=1ca2effccb9f61094ecbeea405eaa40093b01efb;p=catta diff --git a/configure.ac b/configure.ac index 3c554a9..99803ec 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,8 @@ # 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 1.9 -Wall]) @@ -35,6 +35,7 @@ fi # Checks for programs. AC_PROG_CC +AC_PROG_CXX AC_GNU_SOURCE AC_PROG_CPP AC_PROG_INSTALL @@ -58,7 +59,9 @@ 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 strdup strerror strrchr strspn strstr uname setresuid setreuid]) +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday]) AC_FUNC_CHOWN AC_FUNC_STAT @@ -71,7 +74,7 @@ AC_SUBST(GLIB20_CFLAGS) AC_SUBST(GLIB20_LIBS) AC_ARG_ENABLE(gtk, - AS_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 ;; @@ -113,7 +116,7 @@ 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), + AS_HELP_STRING([--disable-xmltoman],[Disable rebuilding of man pages with xmltoman]), [case "${enableval}" in yes) xmltoman=yes ;; no) xmltoman=no ;; @@ -135,7 +138,7 @@ AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes]) # D-BUS # AC_ARG_ENABLE(dbus, - AS_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 ;; @@ -146,9 +149,9 @@ 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.30]) + PKG_CHECK_MODULES(DBUS, [ dbus-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" @@ -156,8 +159,9 @@ if test "x$ENABLE_DBUS" = "xyes"; then DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d" fi AC_SUBST(DBUS_SYS_DIR) - - AC_SUBST(DBUS_CFLAGS) + + DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE" + AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) fi @@ -191,7 +195,7 @@ fi # # Detecting the linux distro for specific things like initscripts. # -AC_ARG_WITH(distro, AS_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") @@ -224,7 +228,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 @@ -233,7 +237,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 @@ -253,7 +257,24 @@ AC_SUBST(avahi_socket) # # Python stuff # -AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no]) +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 ]) # ========================================================================== @@ -262,6 +283,7 @@ Makefile avahi-core.pc avahi-common/Makefile avahi-core/Makefile +avahi-glib/Makefile avahi-daemon/Makefile avahi-daemon/avahi-dbus.conf avahi-discover-standalone/Makefile @@ -276,6 +298,7 @@ avahi-utils/avahi/Makefile examples/Makefile common/Makefile man/Makefile +tests/Makefile ]) AC_OUTPUT