svn commit: r1421618 - /subversion/trunk/subversion/libsvn_subr/sysinfo.c

[breser]

Author: breser
Date: Thu Dec 13 23:38:47 2012
New Revision: 1421618

URL: http://svn.apache.org/viewvc?rev=1421618&view=rev
Log:
APR-Util won't exist if using APR 2.x+ so don't try to list it as a linked lib.

* subversion/libsvn_subr/sysinfo.c
  (svn_sysinfo__linked_libs): Don't list APR-Util if APU_VERSION_STRING is not
    defined.

Modified:
    subversion/trunk/subversion/libsvn_subr/sysinfo.c

Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sysinfo.c?rev=1421618&r1=1421617&r2=1421618&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sysinfo.c Thu Dec 13 23:38:47 2012
@@ -133,10 +133,14 @@ svn_sysinfo__linked_libs(apr_pool_t *poo
   lib->compiled_version = APR_VERSION_STRING;
   lib->runtime_version = apr_pstrdup(pool, apr_version_string());
 
+/* Don't list APR-Util if it isn't linked in, which it may not be if
+ * we're using APR 2.x+ which combined APR-Util into APR. */
+#ifdef APU_VERSION_STRING
   lib = &APR_ARRAY_PUSH(array, svn_version_ext_linked_lib_t);
   lib->name = "APR-Util";
   lib->compiled_version = APU_VERSION_STRING;
   lib->runtime_version = apr_pstrdup(pool, apu_version_string());
+#endif
 
   lib = &APR_ARRAY_PUSH(array, svn_version_ext_linked_lib_t);
   lib->name = "SQLite";