diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2009-08-10 20:11:11 +0100 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2009-08-10 20:11:11 +0100 |
| commit | c6c19a2edcc7f206a1cfdf6d91e3d584f7705b9f (patch) | |
| tree | 90269678bc2a42a9492c62e07dbe08ecc10835a3 /m4/ax_caolan_check_package.m4 | |
| parent | 386747c45473a6f4b7ca32a787c316d205705586 (diff) | |
| download | autoconf-archive-c6c19a2edcc7f206a1cfdf6d91e3d584f7705b9f.tar.gz | |
More renamings missed previously.
Diffstat (limited to 'm4/ax_caolan_check_package.m4')
| -rw-r--r-- | m4/ax_caolan_check_package.m4 | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/m4/ax_caolan_check_package.m4 b/m4/ax_caolan_check_package.m4 index c49b868..2fa1cff 100644 --- a/m4/ax_caolan_check_package.m4 +++ b/m4/ax_caolan_check_package.m4 @@ -4,7 +4,7 @@ # # SYNOPSIS # -# AC_caolan_CHECK_PACKAGE(PACKAGE, FUNCTION, LIBRARY , HEADERFILE [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# AX_caolan_CHECK_PACKAGE(PACKAGE, FUNCTION, LIBRARY , HEADERFILE [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) # # DESCRIPTION # @@ -33,15 +33,15 @@ # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. -AC_DEFUN([AC_caolan_CHECK_PACKAGE], +AC_DEFUN([AX_caolan_CHECK_PACKAGE], [ AC_ARG_WITH($1, [ --with-$1[=DIR] root directory of $1 installation], with_$1=$withval if test "${with_$1}" != yes; then - $1_include="$withval/include" - $1_libdir="$withval/lib" + $1_include="$withval/include" + $1_libdir="$withval/lib" fi ) @@ -55,36 +55,36 @@ AC_ARG_WITH($1-libdir, $1_libdir="$withval") if test "${with_$1}" != no ; then - OLD_LIBS=$LIBS - OLD_LDFLAGS=$LDFLAGS - OLD_CFLAGS=$CFLAGS - OLD_CPPFLAGS=$CPPFLAGS + OLD_LIBS=$LIBS + OLD_LDFLAGS=$LDFLAGS + OLD_CFLAGS=$CFLAGS + OLD_CPPFLAGS=$CPPFLAGS - if test "${$1_libdir}" ; then - LDFLAGS="$LDFLAGS -L${$1_libdir}" - fi - if test "${$1_include}" ; then - CPPFLAGS="$CPPFLAGS -I${$1_include}" - CFLAGS="$CFLAGS -I${$1_include}" - fi + if test "${$1_libdir}" ; then + LDFLAGS="$LDFLAGS -L${$1_libdir}" + fi + if test "${$1_include}" ; then + CPPFLAGS="$CPPFLAGS -I${$1_include}" + CFLAGS="$CFLAGS -I${$1_include}" + fi - no_good=no - AC_CHECK_LIB($3,$2,,no_good=yes) - AC_CHECK_HEADER($4,,no_good=yes) - if test "$no_good" = yes; then + no_good=no + AC_CHECK_LIB($3,$2,,no_good=yes) + AC_CHECK_HEADER($4,,no_good=yes) + if test "$no_good" = yes; then dnl broken - ifelse([$6], , , [$6]) + ifelse([$6], , , [$6]) - LIBS=$OLD_LIBS - LDFLAGS=$OLD_LDFLAGS - CPPFLAGS=$OLD_CPPFLAGS - CFLAGS=$OLD_CFLAGS - else + LIBS=$OLD_LIBS + LDFLAGS=$OLD_LDFLAGS + CPPFLAGS=$OLD_CPPFLAGS + CFLAGS=$OLD_CFLAGS + else dnl fixed - ifelse([$5], , , [$5]) + ifelse([$5], , , [$5]) - AC_DEFINE(HAVE_PKG_$1) - fi + AC_DEFINE(HAVE_PKG_$1) + fi fi |