| author | Michael Krelin <hacker@klever.net> | 2013-01-26 12:00:37 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2013-01-26 12:00:37 (UTC) |
| commit | 98b8a37be835d50b71416acd6d285e1eb525b2a1 (patch) (side-by-side diff) | |
| tree | 45e2ff2f2fa08c266de70f35b1c2b41326150cc4 | |
| parent | 6242fdc322cecae7e9d71b390f91ef9dc8f1a162 (diff) | |
| download | iii-98b8a37be835d50b71416acd6d285e1eb525b2a1.zip iii-98b8a37be835d50b71416acd6d285e1eb525b2a1.tar.gz iii-98b8a37be835d50b71416acd6d285e1eb525b2a1.tar.bz2 | |
slightly reworked autotools
introduced aux.d directory and prettified and improved autogen.bash to run from the build
directory in case it differs from source.
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | autogen.bash | 9 | ||||
| -rw-r--r-- | autogen.sh | 8 | ||||
| -rw-r--r-- | configure.ac | 1 |
4 files changed, 11 insertions, 11 deletions
@@ -1,16 +1,14 @@ Makefile Makefile.in /aclocal.m4 /autom4te.cache /config.h /config.h.in /config.log /config.status /configure /stamp-h1 /INSTALL -/depcomp -/install-sh -/missing /NEWS TAGS +/aux.d diff --git a/autogen.bash b/autogen.bash new file mode 100644 index 0000000..a798fad --- a/dev/null +++ b/autogen.bash @@ -0,0 +1,9 @@ +#!/bin/bash +( cd "$(dirname "$0")" \ +&& mkdir -p aux.d \ +&& aclocal \ +&& autoheader \ +&& automake -a \ +&& autoconf \ +&& "$(dirname "$0")"/configure "$@" \ +) diff --git a/autogen.sh b/autogen.sh deleted file mode 100644 index 86d2d88..0000000 --- a/autogen.sh +++ b/dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -WANT_AUTOMAKE=1.8 -export WANT_AUTOMAKE - aclocal \ -&& autoheader \ -&& automake -a \ -&& autoconf \ -&& ./configure "$@" diff --git a/configure.ac b/configure.ac index c814b53..1e0e42c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,34 +1,35 @@ AC_INIT([iii], [0.3], [iii-bugs@klever.net]) AC_CONFIG_SRCDIR([src/iiid.cc]) +AC_CONFIG_AUX_DIR([aux.d]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([dist-bzip2]) AC_PROG_INSTALL AC_PROG_CXX AC_PROG_CC PKG_PROG_PKG_CONFIG AC_HEADER_STDC AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) PKG_CHECK_MODULES([MODULES],[gsoap++ libcrypto libconfuse]) PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) if $have_uuid ; then AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) AC_SUBST([UUID_UUID],[uuid]) fi AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) notfound=false AC_CHECK_HEADERS([archive.h],[ AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) ],[notfound=true]) $notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/]) notfound=false AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([autosprintf.h],[ |