X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=configure.ac;h=981c02a41ad4a2c1565ef9e4110f19a30eb3a673;hb=ad381a9fff751c693c0209e961d59fef0af8e4e2;hp=2eca925570c7afa4ed27e608b99b1dbec4a682dc;hpb=788c921143004a2fdbf3abcba1a59f1693e2e07d;p=catta diff --git a/configure.ac b/configure.ac index 2eca925..981c02a 100644 --- a/configure.ac +++ b/configure.ac @@ -59,14 +59,14 @@ fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` if test "z$with_distro" = "z"; then - AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO]) + AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported.]) exit 1 else case $with_distro in - debian|gentoo|archlinux) + debian|gentoo|archlinux|none) ;; *) - AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome)]) + AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check]) ;; esac fi @@ -133,13 +133,21 @@ AC_FUNC_MEMCMP AC_FUNC_SELECT_ARGTYPES 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 putenv]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday putenv strncasecmp]) AC_FUNC_CHOWN AC_FUNC_STAT AC_TYPE_MODE_T AC_TYPE_PID_T +# Check for pkg-config manually first, as if its not installed the +# PKG_PROG_PKG_CONFIG macro won't be defined. +AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) + +if test x"$have_pkg_config" == xno; then + AC_MSG_ERROR(pkg-config is required to install this program) +fi + PKG_PROG_PKG_CONFIG # @@ -184,8 +192,8 @@ if test "x$HAVE_GTK" = "xyes" ; then AC_SUBST(GLADE20_CFLAGS) AC_SUBST(GLADE20_LIBS) - interfacesdir="${datadir}/${PACKAGE}/interfaces/" - AC_SUBST(interfacesdir) + interfacesdir="${datadir}/${PACKAGE}/interfaces/" + AC_SUBST(interfacesdir) fi AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") @@ -202,21 +210,31 @@ AC_ARG_ENABLE(dbus, [HAVE_DBUS=yes]) AC_ARG_WITH(dbus-sys, AS_HELP_STRING([--with-dbus-sys=