don't be smart about pkgconfig dir

Signed-off-by: Michael Krelin <hacker@klever.net>

3 files changed, 2 insertions, 50 deletions

diff --git a/Makefile.am b/Makefile.am
index 741d585..638d6af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,20 @@
 
 SUBDIRS=include lib test
 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=libopkele.pc
-endif
 
 all-local: NEWS
 if HAVE_DOXYGEN
 clean-local:
 	rm -rf doxydox
 endif
 
 NEWS: NEWS.xsl NEWS.xml
 	${XSLTPROC} -o $@ NEWS.xsl NEWS.xml
 
 if HAVE_DOXYGEN
 dox: Doxyfile
 	${DOXYGEN}
 endif
diff --git a/acinclude.m4 b/acinclude.m4
index 532f978..80defc7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,93 +1,48 @@
-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
   ifelse([$2], , :, [$2])
  else
   HAVE_DOXYGEN="yes"
   AC_SUBST([DOXYGEN])
   $1
  fi
  AC_SUBST([HAVE_DOXYGEN])
  AM_CONDITIONAL([HAVE_DOXYGEN],[test "${HAVE_DOXYGEN}" = "yes"])
 ])
 
 dnl AC_WITH_DOT([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
 dnl Outputs:
 dnl AC_SUBST: DOT HAVE_DOT
 dnl AM_CONDITIONAL: HAVE_DOT
 AC_DEFUN([AC_WITH_DOT],[
  HAVE_DOT="no"
  AC_PATH_PROG([DOT],[dot],[false])
  if test "${DOT}" = "false" ; then
   ifelse([$2], , :, [$2])
  else
   HAVE_DOT="yes"
   AC_SUBST([DOT])
   $1
  fi
 AC_SUBST([HAVE_DOT])
  AM_CONDITIONAL([HAVE_DOT],[test "${HAVE_DOT}" = "yes"])
 ])
 
 dnl AC_WITH_PCRE([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
 dnl Outputs:
 dnl AC_SUBST: PCRE_CONFIG PCRE_PREFIX PCRE_EXEC_PREFIX
 dnl           PCRE_VERSION PCRE_CFLAGS PCRE_LIBS
 dnl           PCRE_LIBS_POSIX PCRE_CFLAGS_POSIX
 dnl AC_DEFINE: HAVE_PCRE PCRE_VERSION
 dnl env: HAVE_PCRE=yes|no
 AC_DEFUN([AC_WITH_PCRE],[
  HAVE_PCRE="no"
  PCRE_CONFIG=""
  PCRE_PREFIX=""
  PCRE_EXEC_PREFIX=""
diff --git a/configure.ac b/configure.ac
index 53e22ba..4f9b6c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,62 +1,62 @@
 AC_INIT([libopkele], [0.3], [libopkele-bugs@klever.net])
 AC_CONFIG_SRCDIR([include/opkele/opkele-config.h])
 AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_PROG_INSTALL
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
 
 AC_HEADER_STDC
 
 AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
-AC_WITH_PKGCONFIG
 
 PKG_CHECK_MODULES([OPENSSL],[openssl],,[
  AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/])
 ])
 
 WANT_KONFORKA="yes"
 AC_ARG_ENABLE([konforka],
  AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]),
  [
   test "${enableval}" = "no" && WANT_KONFORKA="no"
  ]
 )
 if test "${WANT_KONFORKA}" = "yes" ; then
  PKG_CHECK_MODULES([KONFORKA],[konforka],[
   AC_SUBST([KONFORKA_CFLAGS])
   AC_SUBST([KONFORKA_LIBS])
   AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library])
   AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library])
   AC_SUBST([KONFORKA_KONFORKA],[konforka])
  ],[true])
 fi
 
 WANT_DOXYGEN="yes"
 AC_ARG_ENABLE([doxygen],
  AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
  [
   test "${enableval}" = "no" && WANT_DOXYGEN="no"
  ]
 )
 if test "${WANT_DOXYGEN}" = "yes" ; then
  AC_WITH_DOXYGEN
  AC_WITH_DOT
 else
  AM_CONDITIONAL([HAVE_DOXYGEN],[false])
  AM_CONDITIONAL([HAVE_DOT],[false])
 fi
 
 LIBCURL_CHECK_CONFIG(,,,[
  AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/])
 ])
 
 PKG_CHECK_MODULES([PCRE],[libpcre],,[
  AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/])
 ])
 
 curl_ssl_verify_host="true"
 AC_ARG_ENABLE([ssl-verify-host],
  AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]),