Commit 889774ef authored by thomasvs's avatar thomasvs

        * autogen.sh:
        * m4/as-ac-expand.m4:
          add m4 dir and use it
          add an expand macro
        * configure.ac:
          uniformize configure's output across the annodex stack



git-svn-id: http://svn.annodex.net/liboggz/trunk@1334 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent eed95f11
2005-06-13 Thomas Vander Stichele <thomas at apestaart dot org>
* autogen.sh:
* m4/as-ac-expand.m4:
add m4 dir and use it
add an expand macro
* configure.ac:
uniformize configure's output across the annodex stack
2005-06-13 Thomas Vander Stichele <thomas at apestaart dot org>
* doc/Makefile.am:
......
......@@ -118,7 +118,7 @@ if [ -d /sw ]; then
FINK_DETECTED=1
fi
eval "$ACLOCAL"
eval "$ACLOCAL -I m4"
# do we need libtool?
if grep -q PROG_LIBTOOL configure.*; then
......
......@@ -23,6 +23,9 @@ AC_PROG_LIBTOOL
AC_C_CONST
AC_C_BIGENDIAN
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h inttypes.h stdlib.h string.h unistd.h])
......@@ -70,13 +73,13 @@ if test "x${ac_enable_valgrind}" = xyes ; then
if test "x$HAVE_VALGRIND" = xyes ; then
VALGRIND_ENVIRONMENT="valgrind -q --leak-check=yes --show-reachable=yes --num-callers=100"
AC_SUBST(VALGRIND_ENVIRONMENT)
TESTS_INFO="'make check' test suite will be run under:
${VALGRIND_ENVIRONMENT}"
TESTS_INFO="Test suite will be run under:
${VALGRIND_ENVIRONMENT}"
else
TESTS_INFO="'make check' to run test suite (Valgrind not found)"
TESTS_INFO="(Valgrind not found)"
fi
else
TESTS_INFO="'make check' to run test suite (Valgrind testing not enabled)"
TESTS_INFO="(Valgrind testing not enabled)"
fi
dnl Checks for libraries.
......@@ -282,6 +285,11 @@ src/examples/Makefile
oggz.pc
])
AS_AC_EXPAND(LIBDIR, ${libdir})
AS_AC_EXPAND(INCLUDEDIR, ${includedir})
AS_AC_EXPAND(BINDIR, ${bindir})
AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
AC_MSG_RESULT([
------------------------------------------------------------------------
$PACKAGE $VERSION: Automatic configuration OK.
......@@ -298,12 +306,20 @@ AC_MSG_RESULT([
Installation paths:
liboggz: ..................... ${prefix}/lib
Tools: ....................... ${prefix}/bin
C header files: .............. ${prefix}/include/oggz
Documentation: ............... ${prefix}/share/doc/$PACKAGE
liboggz: ..................... ${LIBDIR}
Tools: ....................... ${BINDIR}
C header files: .............. ${INCLUDEDIR}/oggz
Documentation: ............... ${DOCDIR}/$PACKAGE
Building:
Type 'make' to compile $PACKAGE.
Type 'make install' to install $PACKAGE.
${TESTS_INFO}
Type 'make check' to test $PACKAGE using the unittests
contained in the src/tests directory.
${TESTS_INFO}
Example programs will be built but not installed.
------------------------------------------------------------------------
......
dnl as-ac-expand.m4 0.2.0
dnl autostars m4 macro for expanding directories using configure's prefix
dnl thomas@apestaart.org
dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
dnl example
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
AC_DEFUN([AS_AC_EXPAND],
[
EXP_VAR=[$1]
FROM_VAR=[$2]
dnl first expand prefix and exec_prefix if necessary
prefix_save=$prefix
exec_prefix_save=$exec_prefix
dnl if no prefix given, then use /usr/local, the default prefix
if test "x$prefix" = "xNONE"; then
prefix="$ac_default_prefix"
fi
dnl if no exec_prefix given, then use prefix
if test "x$exec_prefix" = "xNONE"; then
exec_prefix=$prefix
fi
full_var="$FROM_VAR"
dnl loop until it doesn't change anymore
while true; do
new_full_var="`eval echo $full_var`"
if test "x$new_full_var" = "x$full_var"; then break; fi
full_var=$new_full_var
done
dnl clean up
full_var=$new_full_var
AC_SUBST([$1], "$full_var")
dnl restore prefix and exec_prefix
prefix=$prefix_save
exec_prefix=$exec_prefix_save
])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment