| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 45 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 2 insertions, 51 deletions
diff --git a/Makefile.am b/Makefile.am index 3e9f0f1..e0f05c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,16 @@ SUBDIRS=include src EXTRA_DIST= NEWS NEWS.xml NEWS.xsl -DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig -if HAVE_PKGCONFIG -pkgconfigdir=@PKGCONFIG_DIR@ +pkgconfigdir=${libdir}/pkgconfig pkgconfig_DATA=kingate.pc kingate-plaincgi.pc if HAVE_FCGI pkgconfig_DATA += kingate-fcgi.pc endif -endif all-local: NEWS if HAVE_DOXYGEN clean-local: rm -rf doxydox endif NEWS: NEWS.xsl NEWS.xml diff --git a/acinclude.m4 b/acinclude.m4 index ec2c50f..9f61d6c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,53 +1,8 @@ -dnl AC_WITH_PKGCONFIG([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) -dnl Outputs: -dnl AC_SUBST: PKGCONFIG_PKGCONFIG PKGCONFIG_DIR -dnl AM_CONDTIONAL: HAVE_PKGCONFIG -AC_DEFUN([AC_WITH_PKGCONFIG],[ - PKGCONFIG_PKGCONFIG="" - PKGCONFIG_DIR="" - HAVE_PKGCONFIG="no" - EXPLICIT_PKGCONFIGDIR="no" - test -z "${WANT_PKGCONFIG}" && WANT_PKGCONFIG="" - AC_PATH_PROG([PKGCONFIG_PKGCONFIG],[pkg-config],[false]) - if test "${PKGCONFIG_PKGCONFIG}" != "false" ; then - AC_ARG_WITH([pkgconfigdir], - AC_HELP_STRING([--with-pkgconfigdir=dir],[Specify pkgconfig directory]), - [ - if test "${withval}" = "no" ; then - WANT_PKGCONFIG="no" - else - PKGCONFIG_DIR="${withval}" - EXPLICIT_PKGCONFIGDIR="yes" - fi - ],[ - AC_MSG_CHECKING([for pkgconfig directory]) - PKGCONFIG_DIR="`${PKGCONFIG_PKGCONFIG} --debug 2>&1 | grep '^Scanning'| head -n 1 | cut -d\' -f2-|cut -d\' -f1`" - AC_MSG_RESULT([${PKGCONFIG_DIR}]) - ] - ) - if test -d "${PKGCONFIG_DIR}" ; then - HAVE_PKGCONFIG=yes - AC_SUBST([PKGCONFIG_PKGCONFIG]) - AC_SUBST([PKGCONFIG_DIR]) - else - AC_MSG_NOTICE([unexistent pkgconfig directory: ${PKGCONFIG_DIR}]) - if test "${EXPLICIT_PKGCONFIGDIR}" = "yes" ; then - HAVE_PKGCONFIG=yes - AC_SUBST([PKGCONFIG_PKGCONFIG]) - AC_SUBST([PKGCONFIG_DIR]) - else - ifelse([$2], , :, [$2]) - fi - fi - fi - AM_CONDITIONAL([HAVE_PKGCONFIG],[test "${HAVE_PKGCONFIG}" = "yes"]) -]) - dnl AC_WITH_DOXYGEN([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) dnl Outputs: dnl AC_SUBST: DOXYGEN HAVE_DOXYGEN dnl AM_CONDTIONAL: HAVE_DOXYGEN AC_DEFUN([AC_WITH_DOXYGEN],[ HAVE_DOXYGEN="no" AC_PATH_PROG([DOXYGEN],[doxygen],[false]) if test "${DOXYGEN}" = "false" ; then diff --git a/configure.ac b/configure.ac index b51d64d..537301f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,16 +3,17 @@ AC_CONFIG_SRCDIR([include/kingate/cgi_gateway.h]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([dist-bzip2]) AC_PROG_INSTALL AC_PROG_AWK AC_PROG_CXX AC_PROG_CC AC_PROG_LIBTOOL +PKG_PROG_PKG_CONFIG AC_HEADER_STDC AC_CHECK_HEADERS([sys/types.h sys/stat.h]) AC_CHECK_DECLS([environ],,,[ #include <unistd.h> ]) HAVE_FCGI=false @@ -34,18 +35,16 @@ AM_CONDITIONAL([HAVE_FCGI],[${HAVE_FCGI}]) AC_C_CONST AC_FUNC_MALLOC AC_FUNC_REALLOC AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) -AC_WITH_PKGCONFIG - PKG_CHECK_MODULES([KONFORKA],[konforka],,[ AC_MSG_ERROR([no konforka library found. get one from http://kin.klever.net/konforka/]) ]) WANT_DOXYGEN="yes" AC_ARG_ENABLE([doxygen], AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), [ |