Agreed. I don't see how this benefits our end users at all. And
developers can just look at config.log.
-Hyrum
On Jun 27, 2009, at 9:54 AM, Greg Stein wrote:
> I don't understand this... config.log can be Huge. That will obscure
> any error message printed by svn's configure.
>
> And I can just look at config.log if necessary.
>
>
>
> On Jun 27, 2009, at 15:11, Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA_at_GMail.Com
>> wrote:
>
>> Author: arfrever
>> Date: Sat Jun 27 05:11:33 2009
>> New Revision: 38218
>>
>> Log:
>> Make `configure` sometimes print the content of 'config.log' when an
>> error occurs.
>>
>> * build/ac-macros/svn-macros.m4
>> (SVN_MSG_ERROR): New.
>>
>> * build/ac-macros/apache.m4:
>> * build/ac-macros/apr.m4:
>> * build/ac-macros/apr_memcache.m4:
>> * build/ac-macros/aprutil.m4:
>> * build/ac-macros/berkeley-db.m4:
>> * build/ac-macros/ctypesgen.m4:
>> * build/ac-macros/gssapi.m4:
>> * build/ac-macros/java.m4:
>> * build/ac-macros/kwallet.m4:
>> * build/ac-macros/neon.m4:
>> * build/ac-macros/sasl.m4:
>> * build/ac-macros/serf.m4:
>> * build/ac-macros/sqlite.m4:
>> * build/ac-macros/swig.m4:
>> * build/ac-macros/zlib.m4:
>> * configure.ac: Use SVN_MSG_ERROR() instead of AC_MSG_ERROR().
>>
>> Modified:
>> trunk/build/ac-macros/apache.m4
>> trunk/build/ac-macros/apr.m4
>> trunk/build/ac-macros/apr_memcache.m4
>> trunk/build/ac-macros/aprutil.m4
>> trunk/build/ac-macros/berkeley-db.m4
>> trunk/build/ac-macros/ctypesgen.m4
>> trunk/build/ac-macros/gssapi.m4
>> trunk/build/ac-macros/java.m4
>> trunk/build/ac-macros/kwallet.m4
>> trunk/build/ac-macros/neon.m4
>> trunk/build/ac-macros/sasl.m4
>> trunk/build/ac-macros/serf.m4
>> trunk/build/ac-macros/sqlite.m4
>> trunk/build/ac-macros/svn-macros.m4
>> trunk/build/ac-macros/swig.m4
>> trunk/build/ac-macros/zlib.m4
>> trunk/configure.ac
>>
>> Modified: trunk/build/ac-macros/apache.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/apache.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/apache.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/apache.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -55,14 +55,14 @@ VERSION_OKAY
>> [AC_MSG_RESULT([recent enough])],
>> [AC_MSG_RESULT([apache too old: mmn must be at least
>> $HTTPD_WANTED_MMN])
>> if test "$APXS_EXPLICIT" != ""; then
>> - AC_MSG_ERROR([Apache APXS build explicitly requested,
>> but apache version is too old])
>> + SVN_MSG_ERROR([Apache APXS build explicitly requested,
>> but apache version is too old])
>> fi
>> APXS=""
>> ])
>>
>> elif test "$APXS_EXPLICIT" != ""; then
>> - AC_MSG_ERROR(no - APXS refers to an old version of Apache
>> - Unable to locate $APXS_INCLUDE/mod_dav.h)
>> + SVN_MSG_ERROR(no - APXS refers to an old version of Apache
>> + Unable to locate $APXS_INCLUDE/mod_dav.h)
>> else
>> AC_MSG_RESULT(no - Unable to locate $APXS_INCLUDE/mod_dav.h)
>> APXS=""
>> @@ -82,7 +82,7 @@ if test -n "$APXS" && test "$APXS" != "n
>> apache_minor_version_wanted_regex=["[1-4]"]
>> ;;
>> *)
>> - AC_MSG_ERROR([unknown APR version])
>> + SVN_MSG_ERROR([unknown APR version])
>> ;;
>> esac
>> AC_EGREP_CPP([apache_minor_version= *
>> $apache_minor_version_wanted_regex],
>> @@ -91,7 +91,7 @@ if test -n "$APXS" && test "$APXS" != "n
>> apache_minor_version=AP_SERVER_MINORVERSION_NUMBER],
>> [AC_MSG_RESULT([yes])],
>> [AC_MSG_RESULT([no])
>> - AC_MSG_ERROR([Apache version incompatible with APR
>> version])])
>> + SVN_MSG_ERROR([Apache version incompatible with APR
>> version])])
>> fi
>>
>> AC_ARG_WITH(apache-libexecdir,
>>
>> Modified: trunk/build/ac-macros/apr.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/apr.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/apr.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/apr.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -30,7 +30,7 @@ AC_DEFUN(SVN_LIB_APR,
>> AC_MSG_CHECKING([APR version])
>> apr_version="`$apr_config --version`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --version failed])
>> + SVN_MSG_ERROR([apr-config --version failed])
>> fi
>> AC_MSG_RESULT([$apr_version])
>>
>> @@ -44,51 +44,51 @@ AC_DEFUN(SVN_LIB_APR,
>>
>> if test $APR_WANTED_REGEX_MATCH -eq 0; then
>> echo "wanted regexes are $APR_WANTED_REGEXES"
>> - AC_MSG_ERROR([invalid apr version found])
>> + SVN_MSG_ERROR([invalid apr version found])
>> fi
>>
>> dnl Get build information from APR
>>
>> CPPFLAGS="$CPPFLAGS `$apr_config --cppflags`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --cppflags failed])
>> + SVN_MSG_ERROR([apr-config --cppflags failed])
>> fi
>>
>> CFLAGS="$CFLAGS `$apr_config --cflags`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --cflags failed])
>> + SVN_MSG_ERROR([apr-config --cflags failed])
>> fi
>>
>> LDFLAGS="$LDFLAGS `$apr_config --ldflags`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --ldflags failed])
>> + SVN_MSG_ERROR([apr-config --ldflags failed])
>> fi
>>
>> SVN_APR_INCLUDES="`$apr_config --includes`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --includes failed])
>> + SVN_MSG_ERROR([apr-config --includes failed])
>> fi
>>
>> SVN_APR_PREFIX="`$apr_config --prefix`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --prefix failed])
>> + SVN_MSG_ERROR([apr-config --prefix failed])
>> fi
>>
>> dnl When APR stores the dependent libs in the .la file, we don't
>> need
>> dnl --libs.
>> SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --link-libtool --libs failed])
>> + SVN_MSG_ERROR([apr-config --link-libtool --libs failed])
>> fi
>>
>> SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --link-ld --libs failed])
>> + SVN_MSG_ERROR([apr-config --link-ld --libs failed])
>> fi
>>
>> SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apr-config --shlib-path-var failed])
>> + SVN_MSG_ERROR([apr-config --shlib-path-var failed])
>> fi
>>
>> AC_SUBST(SVN_APR_PREFIX)
>> @@ -127,5 +127,5 @@ AC_DEFUN(SVN_DOWNLOAD_APR,
>> echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/
>> 1.2.x
>> \\"
>> echo " apr-util"
>> echo ""
>> - AC_MSG_ERROR([no suitable apr found])
>> + SVN_MSG_ERROR([no suitable apr found])
>> ])
>>
>> Modified: trunk/build/ac-macros/apr_memcache.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/apr_memcache.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/apr_memcache.m4 Fri Jun 26 13:02:56
>> 2009 (r38217)
>> +++ trunk/build/ac-macros/apr_memcache.m4 Sat Jun 27 05:11:33
>> 2009 (r38218)
>> @@ -15,7 +15,7 @@ AC_DEFUN(SVN_LIB_APR_MEMCACHE,
>> [Standalone apr_memcache client
>> library]),
>> [
>> if test "$withval" = "yes" ; then
>> - AC_MSG_ERROR([--with-apr_memcache requires an argument.])
>> + SVN_MSG_ERROR([--with-apr_memcache requires an argument.])
>> else
>> AC_MSG_NOTICE([looking for separate apr_memcache package])
>> apr_memcache_prefix=$withval
>>
>> Modified: trunk/build/ac-macros/aprutil.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/aprutil.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/aprutil.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/aprutil.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -40,7 +40,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
>> # shipped in 2.0.43 contains a correct version number, but
>> # stupidly doesn't understand the --version switch.)
>> apu_version=`grep "APRUTIL_DOTTED_VERSION=" $(which $apu_config)
>> | tr -d "APRUTIL_DOTTED_VERSION="| tr -d '"'`
>> - #AC_MSG_ERROR([
>> + #SVN_MSG_ERROR([
>> # apu-config --version failed.
>> # Your apu-config doesn't support the --version switch,
>> please upgrade
>> # to APR-UTIL more recent than 2002-Nov-05.])
>> @@ -57,36 +57,36 @@ AC_DEFUN(SVN_LIB_APRUTIL,
>>
>> if test $APU_WANTED_REGEX_MATCH -eq 0; then
>> echo "wanted regexes are $APRUTIL_WANTED_REGEXES"
>> - AC_MSG_ERROR([invalid apr-util version found])
>> + SVN_MSG_ERROR([invalid apr-util version found])
>> fi
>>
>> dnl Get libraries and thread flags from APRUTIL
>> ---------------------
>>
>> LDFLAGS="$LDFLAGS `$apu_config --ldflags`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apu-config --ldflags failed])
>> + SVN_MSG_ERROR([apu-config --ldflags failed])
>> fi
>>
>> SVN_APRUTIL_INCLUDES="`$apu_config --includes`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apu-config --includes failed])
>> + SVN_MSG_ERROR([apu-config --includes failed])
>> fi
>>
>> SVN_APRUTIL_PREFIX="`$apu_config --prefix`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apu-config --prefix failed])
>> + SVN_MSG_ERROR([apu-config --prefix failed])
>> fi
>>
>> dnl When APR stores the dependent libs in the .la file, we don't
>> need
>> dnl --libs.
>> SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apu-config --link-libtool --libs failed])
>> + SVN_MSG_ERROR([apu-config --link-libtool --libs failed])
>> fi
>>
>> SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([apu-config --link-ld --libs failed])
>> + SVN_MSG_ERROR([apu-config --link-ld --libs failed])
>> fi
>>
>> AC_SUBST(SVN_APRUTIL_INCLUDES)
>> @@ -121,5 +121,5 @@ AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
>> echo "Afterwards, run apr-util/buildconf in that subdirectory and"
>> echo "then run configure again here."
>> echo ""
>> - AC_MSG_ERROR([no suitable APRUTIL found])
>> + SVN_MSG_ERROR([no suitable APRUTIL found])
>> ])
>>
>> Modified: trunk/build/ac-macros/berkeley-db.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/berkeley-db.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/berkeley-db.m4 Fri Jun 26 13:02:56
>> 2009 (r38217)
>> +++ trunk/build/ac-macros/berkeley-db.m4 Sat Jun 27 05:11:33
>> 2009 (r38218)
>> @@ -40,23 +40,23 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
>> elif test "$withval" = "yes"; then
>> apu_db_version="`$apu_config --db-version`"
>> if test $? -ne 0; then
>> - AC_MSG_ERROR([Can't determine whether apr-util is linked
>> against a
>> - proper version of Berkeley DB.])
>> + SVN_MSG_ERROR([Can't determine whether apr-util is linked
>> against a
>> + proper version of Berkeley DB.])
>> fi
>>
>> if test "$withval" = "yes"; then
>> if test "$apu_db_version" != "4"; then
>> - AC_MSG_ERROR([APR-UTIL wasn't linked against Berkeley DB
>> 4,
>> - while the fs component is required.
>> Reinstall
>> - APR-UTIL with the appropiate options.])
>> + SVN_MSG_ERROR([APR-UTIL wasn't linked against Berkeley DB
>> 4,
>> + while the fs component is required.
>> Reinstall
>> + APR-UTIL with the appropiate options.])
>> fi
>>
>> status=required
>>
>> elif test "$apu_found" != "reconfig"; then
>> if test "$apu_db_version" != 4; then
>> - AC_MSG_ERROR([APR-UTIL was installed independently, it
>> won't be
>> - possible to use the specified Berkeley DB:
>> $withval])
>> + SVN_MSG_ERROR([APR-UTIL was installed independently, it
>> won't be
>> + possible to use the specified Berkeley DB:
>> $withval])
>> fi
>>
>> status=required
>> @@ -80,7 +80,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
>>
>> status=required
>> else
>> - AC_MSG_ERROR([Invalid syntax of argument of --with-berkeley-
>> db option])
>> + SVN_MSG_ERROR([Invalid syntax of argument of --with-
>> berkeley-db option])
>> fi
>> fi
>> ],
>> @@ -115,7 +115,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
>> AC_MSG_RESULT([no])
>> svn_lib_berkeley_db=no
>> if test "$status" = "required"; then
>> - AC_MSG_ERROR([Berkeley DB $db_version or newer wasn't
>> found.])
>> + SVN_MSG_ERROR([Berkeley DB $db_version or newer wasn't
>> found.])
>> fi
>> fi
>> fi
>>
>> Modified: trunk/build/ac-macros/ctypesgen.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/ctypesgen.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/ctypesgen.m4 Fri Jun 26 13:02:56
>> 2009 (r38217)
>> +++ trunk/build/ac-macros/ctypesgen.m4 Sat Jun 27 05:11:33
>> 2009 (r38218)
>> @@ -48,8 +48,8 @@ AC_DEFUN(SVN_FIND_CTYPESGEN,
>> fi
>>
>> if test ! -f "$CTYPESGEN" || test ! -x "$CTYPESGEN"; then
>> - AC_MSG_ERROR([Could not find ctypesgen at $where/ctypesgen.py
>> or at
>> - $where/bin/ctypesgen.py])
>> + SVN_MSG_ERROR([Could not find ctypesgen at $where/
>> ctypesgen.py or at
>> + $where/bin/ctypesgen.py])
>> else
>> AC_MSG_RESULT([$CTYPESGEN])
>> fi
>>
>> Modified: trunk/build/ac-macros/gssapi.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/gssapi.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/gssapi.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/gssapi.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -50,10 +50,10 @@ int main()
>> LIBS="$old_LIBS"
>> else
>> AC_MSG_RESULT([no])
>> - AC_MSG_ERROR([cannot find GSSAPI (Kerberos)])
>> + SVN_MSG_ERROR([cannot find GSSAPI (Kerberos)])
>> fi
>> else
>> - AC_MSG_ERROR([cannot find krb5-config])
>> + SVN_MSG_ERROR([cannot find krb5-config])
>> fi
>> else
>> AC_MSG_RESULT([no])
>>
>> Modified: trunk/build/ac-macros/java.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/java.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/java.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/java.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -127,7 +127,7 @@ AC_DEFUN(SVN_FIND_JDK,
>> if test -n "$requested_jikes" && test "$requested_jikes" !=
>> "no"; then
>> dnl Jikes was explicitly requested. Verify that it was
>> provided.
>> if test -z "$jikes_found"; then
>> - AC_MSG_ERROR([Could not find a usable version of Jikes])
>> + SVN_MSG_ERROR([Could not find a usable version of Jikes])
>> elif test -n "$jikes_found" && test "$requested_jikes" !=
>> "yes" &&
>> test "$JAVAC" != "$requested_jikes"; then
>> AC_MSG_WARN([--with-jikes PATH was invalid, substitute found])
>>
>> Modified: trunk/build/ac-macros/kwallet.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/kwallet.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/kwallet.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/kwallet.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -64,29 +64,29 @@ int main()
>> LIBS="$old_LIBS"
>> else
>> AC_MSG_RESULT([no])
>> - AC_MSG_ERROR([cannot find KWallet])
>> + SVN_MSG_ERROR([cannot find KWallet])
>> fi
>> else
>> - AC_MSG_ERROR([cannot find kde4-config])
>> + SVN_MSG_ERROR([cannot find kde4-config])
>> fi
>> else
>> AC_MSG_RESULT([no])
>> - AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
>> + SVN_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
>> fi
>> else
>> - AC_MSG_ERROR([cannot find D-Bus])
>> + SVN_MSG_ERROR([cannot find D-Bus])
>> fi
>> else
>> - AC_MSG_ERROR([cannot find pkg-config])
>> + SVN_MSG_ERROR([cannot find pkg-config])
>> fi
>> else
>> - AC_MSG_ERROR([missing support for internationalization])
>> + SVN_MSG_ERROR([missing support for internationalization])
>> fi
>> else
>> - AC_MSG_ERROR([APR does not have support for DSOs])
>> + SVN_MSG_ERROR([APR does not have support for DSOs])
>> fi
>> else
>> - AC_MSG_ERROR([--with-kwallet conflicts with --disable-shared])
>> + SVN_MSG_ERROR([--with-kwallet conflicts with --disable-
>> shared])
>> fi
>> else
>> AC_MSG_RESULT([no])
>>
>> Modified: trunk/build/ac-macros/neon.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/neon.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/neon.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/neon.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -98,7 +98,7 @@ int main()
>> if test "$shared_linking" = "no"; then
>> NEON_LIBS=`$PKG_CONFIG neon --libs --static`
>> LIBS="$LIBS $NEON_LIBS"
>> - AC_LINK_IFELSE([$neon_test_code], , AC_MSG_ERROR
>> ([cannot find Neon]))
>> + AC_LINK_IFELSE([$neon_test_code], , SVN_MSG_ERROR
>> ([cannot find Neon]))
>> fi
>> CFLAGS="$old_CFLAGS"
>> LIBS="$old_LIBS"
>>
>> Modified: trunk/build/ac-macros/sasl.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/sasl.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/sasl.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/sasl.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -69,7 +69,7 @@ AC_DEFUN(SVN_LIB_SASL,
>> if test "$required" = "yes"; then
>> dnl The user explicitly requested SASL, but we couldn't find
>> it.
>> dnl Exit with an error message.
>> - AC_MSG_ERROR([Could not find Cyrus SASL v2])
>> + SVN_MSG_ERROR([Could not find Cyrus SASL v2])
>> fi
>>
>> SVN_SASL_INCLUDES=""
>>
>> Modified: trunk/build/ac-macros/serf.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/serf.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/serf.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/serf.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -13,7 +13,7 @@ AC_DEFUN(SVN_LIB_SERF,
>> [Serf WebDAV client library]),
>> [
>> if test "$withval" = "yes" ; then
>> - AC_MSG_ERROR([--with-serf requires an argument.])
>> + SVN_MSG_ERROR([--with-serf requires an argument.])
>> elif test "$withval" != "no" ; then
>> AC_MSG_NOTICE([serf library configuration])
>> serf_prefix=$withval
>>
>> Modified: trunk/build/ac-macros/sqlite.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/sqlite.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/sqlite.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/sqlite.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -36,7 +36,7 @@ AC_DEFUN(SVN_LIB_SQLITE,
>> [Use installed SQLite library or
>> amalgamation file.]),
>> [
>> if test "$withval" = "yes" ; then
>> - AC_MSG_ERROR([--with-sqlite requires an argument.])
>> + SVN_MSG_ERROR([--with-sqlite requires an argument.])
>> else
>> sqlite_dir="$withval"
>> fi
>> @@ -224,5 +224,5 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
>> echo "$abs_srcdir/sqlite-amalgamation/sqlite3.c"
>> echo "This file also ships as part of the subversion-deps
>> distribution."
>> echo ""
>> - AC_MSG_ERROR([Subversion requires SQLite])
>> + SVN_MSG_ERROR([Subversion requires SQLite])
>> ])
>>
>> Modified: trunk/build/ac-macros/svn-macros.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/svn-macros.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/svn-macros.m4 Fri Jun 26 13:02:56
>> 2009 (r38217)
>> +++ trunk/build/ac-macros/svn-macros.m4 Sat Jun 27 05:11:33
>> 2009 (r38218)
>> @@ -1,5 +1,28 @@
>> # Miscellaneous additional macros for Subversion's own use.
>>
>> +dnl SVN_MSG_ERROR(ERROR_MESSAGE)
>> +dnl
>> +dnl Wrapper for AC_MSG_ERROR which additionally prints the content
>> of
>> +dnl config.log.
>> +AC_DEFUN([SVN_MSG_ERROR], [
>> + if true; then
>> + {
>> + while true; do
>> + if test -f config.log && test -n "`tail -n1 config.log |
>> grep "configure: exit 1"`"; then
>> + echo
>> + echo "************************************************"
>> + echo "****************** config.log ******************"
>> + echo "************************************************"
>> + cat config.log
>> + break
>> + fi
>> + done
>> + } &
>> + fi
>> + AC_MSG_ERROR([$1])
>> +])
>> +
>> +
>> # SVN_CONFIG_NICE(FILENAME)
>> # Write a shell script to FILENAME (typically 'config.nice') which
>> reinvokes
>> # configure with all of the arguments. Reserves use of the filename
>>
>> Modified: trunk/build/ac-macros/swig.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/swig.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/swig.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/swig.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -46,7 +46,7 @@ AC_DEFUN(SVN_FIND_SWIG,
>> SWIG="$where/bin/swig"
>> fi
>> if test ! -f "$SWIG" || test ! -x "$SWIG"; then
>> - AC_MSG_ERROR([Could not find swig binary at $SWIG])
>> + SVN_MSG_ERROR([Could not find swig binary at $SWIG])
>> fi
>> fi
>>
>> @@ -142,7 +142,7 @@ AC_DEFUN(SVN_FIND_SWIG,
>> ])
>> CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
>> if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
>> - AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this
>> platform])
>> + SVN_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this
>> platform])
>> fi
>> AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
>> ["$svn_cv_pycfmt_apr_int64_t"],
>>
>> Modified: trunk/build/ac-macros/zlib.m4
>> URL: http://svn.collab.net/viewvc/svn/trunk/build/ac-macros/zlib.m4?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/build/ac-macros/zlib.m4 Fri Jun 26 13:02:56 2009
>> (r38217)
>> +++ trunk/build/ac-macros/zlib.m4 Sat Jun 27 05:11:33 2009
>> (r38218)
>> @@ -13,7 +13,7 @@ AC_DEFUN(SVN_LIB_Z,
>> [zlib compression library]),
>> [
>> if test "$withval" = "yes" ; then
>> - AC_MSG_ERROR([--with-zlib requires an argument.])
>> + SVN_MSG_ERROR([--with-zlib requires an argument.])
>> else
>> AC_MSG_NOTICE([zlib library configuration])
>> zlib_prefix=$withval
>> @@ -35,7 +35,7 @@ AC_DEFUN(SVN_LIB_Z,
>> ])
>>
>> if test "$zlib_found" = "no"; then
>> - AC_MSG_ERROR([subversion requires zlib])
>> + SVN_MSG_ERROR([subversion requires zlib])
>> fi
>>
>> if test "$zlib_found" = "yes"; then
>>
>> Modified: trunk/configure.ac
>> URL: http://svn.collab.net/viewvc/svn/trunk/configure.ac?pathrev=38218&r1=38217&r2=38218
>> ===
>> ===
>> ===
>> =====================================================================
>> --- trunk/configure.ac Fri Jun 26 13:02:56 2009 (r38217)
>> +++ trunk/configure.ac Sat Jun 27 05:11:33 2009 (r38218)
>> @@ -228,7 +228,7 @@ elif test "$svn_enable_shared" = "yes" ;
>> fi
>> LT_LDFLAGS="-shared $LT_LDFLAGS"
>> else
>> - AC_MSG_ERROR([can not disable both shared and static libraries])
>> + SVN_MSG_ERROR([can not disable both shared and static libraries])
>> fi
>>
>> dnl Check for --enable-all-static option
>> @@ -252,7 +252,7 @@ AC_ARG_ENABLE(local-library-preloading,
>> if test "$svn_enable_shared" = "yes"; then
>> TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts"
>> else
>> - AC_MSG_ERROR([--enable-local-library-preloading conflicts
>> with --disable-shared])
>> + SVN_MSG_ERROR([--enable-local-library-preloading conflicts
>> with --disable-shared])
>> fi
>> else
>> TRANSFORM_LIBTOOL_SCRIPTS=""
>> @@ -473,23 +473,23 @@ if test "$with_gnome_keyring" != "no"; t
>> SVN_GNOME_KEYRING_LIBS="$DBUS_LIBS `$PKG_CONFIG --libs
>> glib-2.0 gnome-keyring-1`"
>> else
>> AC_MSG_RESULT([no])
>> - AC_MSG_ERROR([cannot find GNOME Keyring])
>> + SVN_MSG_ERROR([cannot find GNOME Keyring])
>> fi
>> else
>> AC_MSG_RESULT([no])
>> - AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc
>> files])
>> + SVN_MSG_ERROR([cannot find GLib and GNOME Keyring .pc
>> files])
>> fi
>> else
>> - AC_MSG_ERROR([cannot find D-Bus])
>> + SVN_MSG_ERROR([cannot find D-Bus])
>> fi
>> else
>> - AC_MSG_ERROR([cannot find pkg-config])
>> + SVN_MSG_ERROR([cannot find pkg-config])
>> fi
>> else
>> - AC_MSG_ERROR([APR does not have support for DSOs])
>> + SVN_MSG_ERROR([APR does not have support for DSOs])
>> fi
>> else
>> - AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-
>> shared])
>> + SVN_MSG_ERROR([--with-gnome-keyring conflicts with --disable-
>> shared])
>> fi
>> else
>> AC_MSG_RESULT([no])
>> @@ -713,7 +713,7 @@ AS_HELP_STRING([--enable-maintainer-mode
>> [
>> if test "$enableval" = "yes" ; then
>> if test "$enable_debugging" = "no" ; then
>> - AC_MSG_ERROR(Can't have --disable-debug and --enable-
>> maintainer-mode)
>> + SVN_MSG_ERROR(Can't have --disable-debug and --enable-
>> maintainer-mode)
>> fi
>> enable_debugging=yes
>> if test "$GCC" = "yes"; then
>> @@ -778,7 +778,7 @@ AS_HELP_STRING([--with-editor=PATH],
>> [
>>
>> if test "$withval" = "yes" ; then
>> - AC_MSG_ERROR([--with-editor requires an argument.])
>> + SVN_MSG_ERROR([--with-editor requires an argument.])
>> else
>> SVN_CLIENT_EDITOR=$withval
>> AC_DEFINE_UNQUOTED(SVN_CLIENT_EDITOR, "$SVN_CLIENT_EDITOR",
>> @@ -815,8 +815,8 @@ AS_HELP_STRING([--enable-gprof],
>> dnl feel free to extend this to include them.
>> if test "$GCC" = "yes"; then
>> if test "$svn_enable_shared" = "yes" ; then
>> - AC_MSG_ERROR(Can't have --enable-gprof without --disable-
>> shared (we
>> - recommend also using --enable-all-static).)
>> + SVN_MSG_ERROR(Can't have --enable-gprof without --disable-
>> shared (we
>> + recommend also using --enable-all-static).)
>> fi
>> if test ! "$enable_all_static" = "yes" ; then
>> AC_MSG_WARN(We recommend --enable-all-static with --enable-
>> gprof.)
>> @@ -826,7 +826,7 @@ AS_HELP_STRING([--enable-gprof],
>> CXXFLAGS="$CXXFLAGS -pg"
>> LT_LDFLAGS="$LT_LDFLAGS -pg"
>> else
>> - AC_MSG_ERROR(We only support --enable-gprof with GCC right
>> now.)
>> + SVN_MSG_ERROR(We only support --enable-gprof with GCC right
>> now.)
>> fi
>> fi
>> ])
>> @@ -892,7 +892,7 @@ AS_HELP_STRING([--enable-runtime-module-
>> if test "$enableval" = "yes"; then
>> use_dso=yes
>> if test "$svn_enable_shared" = "no"; then
>> - AC_MSG_ERROR([--enable-runtime-module-search conflicts with
>> --disable-shared])
>> + SVN_MSG_ERROR([--enable-runtime-module-search conflicts
>> with --disable-shared])
>> fi
>> AC_DEFINE(SVN_USE_DSO, 1,
>> [Defined if svn should try to load DSOs])
>> @@ -982,8 +982,8 @@ LT_CXX_LIBADD=""
>> if test "$do_javahl_build" = "yes"; then
>> dnl Check for suitable JDK
>> if test "$JDK_SUITABLE" = "no"; then
>> - AC_MSG_ERROR([Cannot compile JavaHL without a suitable JDK.
>> - Please specify a suitable JDK using the --with-
>> jdk option.])
>> + SVN_MSG_ERROR([Cannot compile JavaHL without a suitable JDK.
>> + Please specify a suitable JDK using the --with-
>> jdk option.])
>> fi
>>
>> dnl The temporary directory where libtool compiles libsvnjavahl.
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2365944
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2365970
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2366330
Received on 2009-06-29 15:08:01 CEST