Cleanup configure script and add back unit tests (make test).

This commit is contained in:
brectanus
2008-01-02 23:52:34 +00:00
parent badb2791f1
commit 40c57f8716
4 changed files with 76 additions and 19 deletions

View File

@@ -2,11 +2,15 @@ dnl Check for APR Libraries
dnl CHECK_APR(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
dnl Sets:
dnl APR_CFLAGS
dnl APR_LDFLAGS
dnl APR_LIBS
dnl APR_LINK_LD
APR_CONFIG="apr-config"
APR_CFLAGS=""
APR_LDFLAGS=""
APR_LIBS=""
APR_LINK_LD=""
AC_DEFUN([CHECK_APR],
[dnl
@@ -36,8 +40,10 @@ done
if test -n "${with_apr}"; then
APR_CONFIG="${with_apr}/bin/${APR_CONFIG}"
AC_MSG_RESULT([${APR_CONFIG}])
APR_CFLAGS="`${APR_CONFIG} --cflags`"
APR_CFLAGS="`${APR_CONFIG} --includes`"
APR_LDFLAGS="`${APR_CONFIG} --ldflags`"
APR_LIBS="`${APR_CONFIG} --libs`"
APR_LINK_LD="`${APR_CONFIG} --link-ld`"
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
else
@@ -46,6 +52,8 @@ fi
AC_SUBST(APR_LIBS)
AC_SUBST(APR_CFLAGS)
AC_SUBST(APR_LDFLAGS)
AC_SUBST(APR_LINK_LD)
if test -z "${APR_LIBS}"; then
AC_MSG_NOTICE([*** apr library not found.])

View File

@@ -2,11 +2,15 @@ dnl Check for APU Libraries
dnl CHECK_APU(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
dnl Sets:
dnl APU_CFLAGS
dnl APU_LDFLAGS
dnl APU_LIBS
dnl APU_LINK_LD
APU_CONFIG="apu-1-config"
APU_CFLAGS=""
APU_LDFLAGS=""
APU_LIBS=""
APU_LINK_LD=""
AC_DEFUN([CHECK_APU],
[dnl
@@ -36,8 +40,10 @@ done
if test -n "${with_apu}"; then
APU_CONFIG="${with_apu}/bin/${APU_CONFIG}"
AC_MSG_RESULT([${APU_CONFIG}])
APU_CFLAGS="`${APU_CONFIG} --cflags`"
APU_CFLAGS="`${APU_CONFIG} --includes`"
APU_LDFLAGS="`${APU_CONFIG} --ldflags`"
APU_LIBS="`${APU_CONFIG} --libs`"
APU_LINK_LD="`${APU_CONFIG} --link-ld`"
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
else
@@ -46,6 +52,8 @@ fi
AC_SUBST(APU_LIBS)
AC_SUBST(APU_CFLAGS)
AC_SUBST(APU_LDFLAGS)
AC_SUBST(APU_LINK_LD)
if test -z "${APU_LIBS}"; then
AC_MSG_NOTICE([*** apu library not found.])