apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1509460 - /apr/apr-util/branches/1.5.x/build/apu-conf.m4
Date Thu, 01 Aug 2013 22:53:41 GMT
Author: wrowe
Date: Thu Aug  1 22:53:41 2013
New Revision: 1509460

URL: http://svn.apache.org/r1509460
Log:
On some shells, test x && APR_ADDTO() is an invalid construct, because
APR_ADDTO() expands as a multiline with a leading newline.


Modified:
    apr/apr-util/branches/1.5.x/build/apu-conf.m4

Modified: apr/apr-util/branches/1.5.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/apu-conf.m4?rev=1509460&r1=1509459&r2=1509460&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/apu-conf.m4 Thu Aug  1 22:53:41 2013
@@ -285,8 +285,11 @@ AC_ARG_WITH(ldap,[  --with-ldap=library 
         APU_FIND_LDAPLIB($LIBLDAP, "-ldl -lpthread")
       fi
 
-      test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
-      test ${apu_has_ldap} == "1" && APR_ADDTO(LDADD_ldap, [$LDADD_ldap_found])
+      if test ${apu_has_ldap} != "1"; then
+        AC_MSG_ERROR(could not find an LDAP library)
+      else
+        APR_ADDTO(LDADD_ldap, [$LDADD_ldap_found])
+      fi
       AC_CHECK_LIB($apu_liblber_name, ber_init,
         [APR_ADDTO(LDADD_ldap, [-l${apu_liblber_name}])])
 



Mime
View raw message