X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=a141ad6822592851260635639996daec5315f1a1;hb=3a1fef3f4a83e7f2d8bcff2f692ff07053001f6d;hp=11b7bc0d375fa6bad5c0bd6eab1ffba94c40e1b5;hpb=e26b546ee463cdbe2433367f6bcb9aec476fbee0;p=catta diff --git a/configure.ac b/configure.ac index 11b7bc0..a141ad6 100644 --- a/configure.ac +++ b/configure.ac @@ -55,10 +55,12 @@ AC_HEADER_TIME # 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 strerror strrchr 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 ]) @@ -84,6 +86,18 @@ if test "x$ENABLE_GTK" = "xyes"; then PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ]) 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 + fi AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes") @@ -107,9 +121,9 @@ 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 + AC_DEFINE(ENABLE_DBUS, 1, [Whether to use DBUS or not]) PKG_CHECK_MODULES(DBUS, [ dbus-glib-1 >= 0.23]) AC_ARG_WITH(dbus-sys, [ --with-dbus-sys=