X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=configure.ac;h=e1624525f47c468867facab52798d8b16822ca69;hb=98d4644e8f9445fa4cf7395b05a9f860b8f3cb9c;hp=59a50ce76ca1242bebb3d5a3bc53eb8ac54f7829;hpb=4f047d2745c90f5d68b9fcf63c276c1369a84cc3;p=catta diff --git a/configure.ac b/configure.ac index 59a50ce..e162452 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=