summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-10-01 13:41:33 (UTC)
committer Michael Krelin <hacker@klever.net>2007-10-01 13:41:33 (UTC)
commitc7be373560c95ed9d1214b17bed6215f49f844d6 (patch) (side-by-side diff)
tree7bf0666a3207ed932cdd0e2c6d1875a745b89192
parent29f2fd81e0f4e62c54371b90469d64ec5e47bd8a (diff)
downloadsitecing-c7be373560c95ed9d1214b17bed6215f49f844d6.zip
sitecing-c7be373560c95ed9d1214b17bed6215f49f844d6.tar.gz
sitecing-c7be373560c95ed9d1214b17bed6215f49f844d6.tar.bz2
don't be smart about pkgconfig dirpublic/nextnext
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am5
-rw-r--r--acinclude.m445
-rw-r--r--configure.ac3
3 files changed, 2 insertions, 51 deletions
diff --git a/Makefile.am b/Makefile.am
index fb04e49..01b6df7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,8 @@
SUBDIRS=include lib share src components
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=sitecing.pc
-endif
all-local: NEWS
if HAVE_DOXYGEN
diff --git a/acinclude.m4 b/acinclude.m4
index 14b6de7..e732535 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,48 +1,3 @@
-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
diff --git a/configure.ac b/configure.ac
index bb1557a..a7741c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ AC_PROG_CXX
AC_PROG_CC
AM_PROG_LEX
AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h unistd.h])
@@ -18,8 +19,6 @@ AC_C_CONST
AC_FUNC_MALLOC
AC_FUNC_REALLOC
-AC_WITH_PKGCONFIG
-
PKG_CHECK_MODULES([KONFORKA],[konforka >= 0.0.1],,[
AC_MSG_ERROR([no proper version of konforka library found, get it at http://kin.klever.net/konforka/])
])