summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am5
-rw-r--r--acinclude.m445
-rw-r--r--configure.ac2
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,12 +1,9 @@
1SUBDIRS=include lib 1SUBDIRS=include lib
2EXTRA_DIST = NEWS NEWS.xml NEWS.xsl 2EXTRA_DIST = NEWS NEWS.xml NEWS.xsl
3 3
4DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig 4pkgconfigdir=${libdir}/pkgconfig
5if HAVE_PKGCONFIG
6pkgconfigdir=@PKGCONFIG_DIR@
7pkgconfig_DATA=konforka.pc 5pkgconfig_DATA=konforka.pc
8endif
9 6
10all-local: NEWS 7all-local: NEWS
11if HAVE_DOXYGEN 8if HAVE_DOXYGEN
12clean-local: 9clean-local:
diff --git a/acinclude.m4 b/acinclude.m4
index ec2c50f..9f61d6c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,49 +1,4 @@
1dnl AC_WITH_PKGCONFIG([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
2dnl Outputs:
3dnl AC_SUBST: PKGCONFIG_PKGCONFIG PKGCONFIG_DIR
4dnl AM_CONDTIONAL: HAVE_PKGCONFIG
5AC_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
46dnl AC_WITH_DOXYGEN([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) 1dnl AC_WITH_DOXYGEN([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
47dnl Outputs: 2dnl Outputs:
48dnl AC_SUBST: DOXYGEN HAVE_DOXYGEN 3dnl AC_SUBST: DOXYGEN HAVE_DOXYGEN
49dnl AM_CONDTIONAL: HAVE_DOXYGEN 4dnl AM_CONDTIONAL: HAVE_DOXYGEN
diff --git a/configure.ac b/configure.ac
index 33d1a59..7a302a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,9 @@ AC_PROG_INSTALL
7AC_PROG_AWK 7AC_PROG_AWK
8AC_PROG_CXX 8AC_PROG_CXX
9AC_PROG_CC 9AC_PROG_CC
10AC_PROG_LIBTOOL 10AC_PROG_LIBTOOL
11PKG_PROG_PKG_CONFIG
11 12
12AC_HEADER_STDC 13AC_HEADER_STDC
13 14
14AC_C_CONST 15AC_C_CONST
@@ -17,9 +18,8 @@ AC_FUNC_MALLOC
17AC_FUNC_REALLOC 18AC_FUNC_REALLOC
18 19
19AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 20AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
20 21
21AC_WITH_PKGCONFIG
22WANT_DOXYGEN="yes" 22WANT_DOXYGEN="yes"
23AC_ARG_ENABLE([doxygen], 23AC_ARG_ENABLE([doxygen],
24 AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), 24 AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
25 [ 25 [