author | Michael Krelin <hacker@klever.net> | 2009-04-11 16:51:27 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-04-11 16:51:27 (UTC) |
commit | 4ac7115c3580315ad5979696042097db61405b78 (patch) (unidiff) | |
tree | db9aa00bef0f944e457d4c92d1c8f8e00e8205b9 | |
parent | d0509b2da90aa54ea923cf5731174e6b0a33d0eb (diff) | |
download | libopkele-4ac7115c3580315ad5979696042097db61405b78.zip libopkele-4ac7115c3580315ad5979696042097db61405b78.tar.gz libopkele-4ac7115c3580315ad5979696042097db61405b78.tar.bz2 |
added AC_CONFIG_AUX_DIR
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | .gitignore | 34 | ||||
-rw-r--r-- | configure.ac | 1 |
2 files changed, 15 insertions, 20 deletions
@@ -1,22 +1,16 @@ | |||
1 | configure | 1 | /configure |
2 | Makefile.in | 2 | Makefile.in |
3 | Doxyfile | 3 | /Doxyfile |
4 | config.log | 4 | /config.log |
5 | depcomp | 5 | /config.h |
6 | config.guess | 6 | /INSTALL |
7 | config.h | 7 | /NEWS |
8 | config.sub | ||
9 | ltmain.sh | ||
10 | INSTALL | ||
11 | NEWS | ||
12 | Makefile | 8 | Makefile |
13 | config.status | 9 | /config.status |
14 | stamp-h1 | 10 | /stamp-h1 |
15 | config.h.in | 11 | /config.h.in |
16 | libtool | 12 | /autom4te.cache |
17 | autom4te.cache | 13 | /libopkele.pc |
18 | libopkele.pc | 14 | /aclocal.m4 |
19 | missing | 15 | /aclocal.d |
20 | aclocal.m4 | 16 | /aux.d |
21 | install-sh | ||
22 | aclocal.d | ||
diff --git a/configure.ac b/configure.ac index fd68b5b..2ded490 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,52 +1,53 @@ | |||
1 | AC_INIT([libopkele], [2.0.2], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [2.0.2], [libopkele-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) | 2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) |
3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) | 3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) |
4 | AC_CONFIG_MACRO_DIR([aclocal.d]) | 4 | AC_CONFIG_MACRO_DIR([aclocal.d]) |
5 | AC_CONFIG_AUX_DIR([aux.d]) | ||
5 | AM_INIT_AUTOMAKE([dist-bzip2]) | 6 | AM_INIT_AUTOMAKE([dist-bzip2]) |
6 | 7 | ||
7 | AC_PROG_INSTALL | 8 | AC_PROG_INSTALL |
8 | AC_PROG_CXX | 9 | AC_PROG_CXX |
9 | AC_PROG_CC | 10 | AC_PROG_CC |
10 | AC_PROG_LIBTOOL | 11 | AC_PROG_LIBTOOL |
11 | PKG_PROG_PKG_CONFIG | 12 | PKG_PROG_PKG_CONFIG |
12 | 13 | ||
13 | AC_HEADER_STDC | 14 | AC_HEADER_STDC |
14 | AC_CHECK_FUNCS([timegm]) | 15 | AC_CHECK_FUNCS([timegm]) |
15 | 16 | ||
16 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 17 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
17 | 18 | ||
18 | AC_MSG_CHECKING([for source tree version]) | 19 | AC_MSG_CHECKING([for source tree version]) |
19 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 20 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then |
20 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" | 21 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" |
21 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ | 22 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ |
22 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" | 23 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" |
23 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" | 24 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" |
24 | else | 25 | else |
25 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 26 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
26 | fi | 27 | fi |
27 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 28 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
28 | AC_SUBST([PACKAGE_SRC_VERSION]) | 29 | AC_SUBST([PACKAGE_SRC_VERSION]) |
29 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | 30 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) |
30 | 31 | ||
31 | tr1_mem_std="false" | 32 | tr1_mem_std="false" |
32 | tr1_mem_boost="false" | 33 | tr1_mem_boost="false" |
33 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) | 34 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) |
34 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) | 35 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) |
35 | tr1_mem="" | 36 | tr1_mem="" |
36 | AC_ARG_WITH([tr1-memory], | 37 | AC_ARG_WITH([tr1-memory], |
37 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), | 38 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), |
38 | [ tr1_mem="$withval" ] | 39 | [ tr1_mem="$withval" ] |
39 | ) | 40 | ) |
40 | AC_MSG_CHECKING([for tr1/memory implementation to use]) | 41 | AC_MSG_CHECKING([for tr1/memory implementation to use]) |
41 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std | 42 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std |
42 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost | 43 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost |
43 | if test -z "$tr1_mem" ; then | 44 | if test -z "$tr1_mem" ; then |
44 | AC_MSG_RESULT([none found]) | 45 | AC_MSG_RESULT([none found]) |
45 | else | 46 | else |
46 | AC_MSG_RESULT([$tr1_mem]) | 47 | AC_MSG_RESULT([$tr1_mem]) |
47 | fi | 48 | fi |
48 | case "$tr1_mem" in | 49 | case "$tr1_mem" in |
49 | std) | 50 | std) |
50 | $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found]) | 51 | $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found]) |
51 | OPKELE_TR1_MEM_NS=std::tr1 | 52 | OPKELE_TR1_MEM_NS=std::tr1 |
52 | OPKELE_TR1_MEM_HEADER=tr1/memory | 53 | OPKELE_TR1_MEM_HEADER=tr1/memory |