[[[
Allow build against the full path to neon-config.
* build/ac-macros/neon.m4
(SVN_LIB_NEON): Modified to accept full path to neon-config. Fixed doc
string accordingly.
]]]
-Alexander Thomas(AT)
Index: build/ac-macros/neon.m4
===================================================================
--- build/ac-macros/neon.m4 (revision 890198)
+++ build/ac-macros/neon.m4 (working copy)
@@ -27,13 +27,15 @@
dnl recommended version of Neon.
dnl
dnl If a --with-neon option is passed (no argument), then a search for
-dnl neon on the system is performed.
+dnl neon on the system is performed using pkg-config if not found
+dnl looks for neon-config in $PATH.
dnl
-dnl If a --with-neon=PREFIX option is passed search for a suitable
+dnl If a --with-neon=PATH option is passed search for a suitable
dnl neon installed on the system whose configuration can be found in
-dnl PREFIX/bin/neon-config.
+dnl PREFIX/bin/neon-config. PATH option can be a full path to
+dnl neon-config.
dnl
-dnl If the search for neon fails, set svn_lib_neon to no, otherwise set
+dnl If the search for neon fails, set svn_lib_neon to no, otherwise set
dnl it to yes.
AC_DEFUN(SVN_LIB_NEON,
@@ -45,10 +47,10 @@
AC_MSG_NOTICE([checking neon library])
AC_ARG_WITH(neon,
- AS_HELP_STRING([--with-neon=PREFIX],
- [Determine neon library configuration based on
- 'PREFIX/bin/neon-config'. Default is to search for
- neon-config in $PATH.]),
+ AS_HELP_STRING([--with-neon=PATH],
+ [Determine neon library configuration based on
+ 'PATH/bin/neon-config' or the full path to neon-config.
+ Default is to search for neon-config in $PATH.]),
[
if test "$withval" = "yes" ; then
if test -n "$PKG_CONFIG" && $PKG_CONFIG neon --exists ; then
@@ -57,7 +59,11 @@
AC_PATH_PROG(neon_config, neon-config)
fi
else
- neon_config="$withval/bin/neon-config"
+ if test -x "$withval"; then
+ neon_config="$withval"
+ else
+ neon_config="$withval/bin/neon-config"
+ fi
fi
SVN_NEON_CONFIG()
