don't try to be smart about pkgconfig directory

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

3 files changed, 2 insertions, 50 deletions

diff --git a/Makefile.am b/Makefile.am
index aab3c4b..4c706b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,19 @@
 SUBDIRS=include lib
 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=konforka.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:
         ${DOXYGEN}
 endif
diff --git a/acinclude.m4 b/acinclude.m4
index ec2c50f..9f61d6c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,69 +1,24 @@
-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"
diff --git a/configure.ac b/configure.ac
index 33d1a59..7a302a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,45 +1,45 @@
 AC_INIT([konforka], [0.0.1], [konforka-bugs@klever.net])
 AC_CONFIG_SRCDIR([include/konforka/exception.h])
 AC_CONFIG_HEADER([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_C_CONST
 
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 
 AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
 
-AC_WITH_PKGCONFIG
 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
 
 WANT_PQXX="yes"
 AC_ARG_WITH([libpqxx],
  AC_HELP_STRING([--without-libpqxx],[do not build libpqxx connection pool support]),
  [
   test "${withval}" = "no" && WANT_PQXX="no"
  ]
 )
 HAVE_PQXX="no"
 PC_REQ_PQXX=""