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) (unidiff) | |
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 @@ | |||
1 | 1 | ||
2 | SUBDIRS=include lib test | 2 | SUBDIRS=include lib test |
3 | EXTRA_DIST= NEWS NEWS.xml NEWS.xsl | 3 | EXTRA_DIST= NEWS NEWS.xml NEWS.xsl |
4 | 4 | ||
5 | DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig | 5 | pkgconfigdir=${libdir}/pkgconfig |
6 | if HAVE_PKGCONFIG | ||
7 | pkgconfigdir=@PKGCONFIG_DIR@ | ||
8 | pkgconfig_DATA=libopkele.pc | 6 | pkgconfig_DATA=libopkele.pc |
9 | endif | ||
10 | 7 | ||
11 | all-local: NEWS | 8 | all-local: NEWS |
12 | if HAVE_DOXYGEN | 9 | if HAVE_DOXYGEN |
13 | clean-local: | 10 | clean-local: |
diff --git a/acinclude.m4 b/acinclude.m4 index 532f978..80defc7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 | |||
@@ -1,49 +1,4 @@ | |||
1 | dnl AC_WITH_PKGCONFIG([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) | ||
2 | dnl Outputs: | ||
3 | dnl AC_SUBST: PKGCONFIG_PKGCONFIG PKGCONFIG_DIR | ||
4 | dnl AM_CONDTIONAL: HAVE_PKGCONFIG | ||
5 | AC_DEFUN([AC_WITH_PKGCONFIG],[ | ||
6 | PKGCONFIG_PKGCONFIG="" | ||
7 | PKGCONFIG_DIR="" | ||
8 | HAVE_PKGCONFIG="no" | ||
9 | EXPLICIT_PKGCONFIGDIR="no" | ||
10 | test -z "${WANT_PKGCONFIG}" && WANT_PKGCONFIG="" | ||
11 | AC_PATH_PROG([PKGCONFIG_PKGCONFIG],[pkg-config],[false]) | ||
12 | if test "${PKGCONFIG_PKGCONFIG}" != "false" ; then | ||
13 | AC_ARG_WITH([pkgconfigdir], | ||
14 | AC_HELP_STRING([--with-pkgconfigdir=dir],[Specify pkgconfig directory]), | ||
15 | [ | ||
16 | if test "${withval}" = "no" ; then | ||
17 | WANT_PKGCONFIG="no" | ||
18 | else | ||
19 | PKGCONFIG_DIR="${withval}" | ||
20 | EXPLICIT_PKGCONFIGDIR="yes" | ||
21 | fi | ||
22 | ],[ | ||
23 | AC_MSG_CHECKING([for pkgconfig directory]) | ||
24 | PKGCONFIG_DIR="`${PKGCONFIG_PKGCONFIG} --debug 2>&1 | grep '^Scanning'| head -n 1 | cut -d\' -f2-|cut -d\' -f1`" | ||
25 | AC_MSG_RESULT([${PKGCONFIG_DIR}]) | ||
26 | ] | ||
27 | ) | ||
28 | if test -d "${PKGCONFIG_DIR}" ; then | ||
29 | HAVE_PKGCONFIG=yes | ||
30 | AC_SUBST([PKGCONFIG_PKGCONFIG]) | ||
31 | AC_SUBST([PKGCONFIG_DIR]) | ||
32 | else | ||
33 | AC_MSG_NOTICE([unexistent pkgconfig directory: ${PKGCONFIG_DIR}]) | ||
34 | if test "${EXPLICIT_PKGCONFIGDIR}" = "yes" ; then | ||
35 | HAVE_PKGCONFIG=yes | ||
36 | AC_SUBST([PKGCONFIG_PKGCONFIG]) | ||
37 | AC_SUBST([PKGCONFIG_DIR]) | ||
38 | else | ||
39 | ifelse([$2], , :, [$2]) | ||
40 | fi | ||
41 | fi | ||
42 | fi | ||
43 | AM_CONDITIONAL([HAVE_PKGCONFIG],[test "${HAVE_PKGCONFIG}" = "yes"]) | ||
44 | ]) | ||
45 | |||
46 | dnl AC_WITH_DOXYGEN([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) | 1 | dnl AC_WITH_DOXYGEN([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) |
47 | dnl Outputs: | 2 | dnl Outputs: |
48 | dnl AC_SUBST: DOXYGEN HAVE_DOXYGEN | 3 | dnl AC_SUBST: DOXYGEN HAVE_DOXYGEN |
49 | dnl AM_CONDTIONAL: HAVE_DOXYGEN | 4 | 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]) | |||
6 | AC_PROG_INSTALL | 6 | AC_PROG_INSTALL |
7 | AC_PROG_CXX | 7 | AC_PROG_CXX |
8 | AC_PROG_CC | 8 | AC_PROG_CC |
9 | AC_PROG_LIBTOOL | 9 | AC_PROG_LIBTOOL |
10 | PKG_PROG_PKG_CONFIG | ||
10 | 11 | ||
11 | AC_HEADER_STDC | 12 | AC_HEADER_STDC |
12 | 13 | ||
13 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 14 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
14 | AC_WITH_PKGCONFIG | ||
15 | 15 | ||
16 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 16 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ |
17 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) | 17 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) |
18 | ]) | 18 | ]) |