| author | Michael Krelin <hacker@klever.net> | 2007-10-01 13:25:32 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-10-01 13:25:32 (UTC) |
| commit | a4c2f2e18459bc8f97860362cbde9070f51993d8 (patch) (side-by-side diff) | |
| tree | a84f9f296c64b22c0891f94a40dfbad68e5f2292 | |
| parent | 1e329b6fcb1f6d2df9b3337c574bbcd7e66c27ea (diff) | |
| download | libopkele-a4c2f2e18459bc8f97860362cbde9070f51993d8.zip libopkele-a4c2f2e18459bc8f97860362cbde9070f51993d8.tar.gz libopkele-a4c2f2e18459bc8f97860362cbde9070f51993d8.tar.bz2 | |
don't be smart about pkgconfig dir
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 45 | ||||
| -rw-r--r-- | configure.ac | 2 |
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,13 +1,10 @@ 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: diff --git a/acinclude.m4 b/acinclude.m4 index 532f978..80defc7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,49 +1,4 @@ -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 diff --git a/configure.ac b/configure.ac index 53e22ba..4f9b6c2 100644 --- a/configure.ac +++ b/configure.ac @@ -6,13 +6,13 @@ 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/]) ]) |