You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by be...@apache.org on 2005/06/09 18:10:54 UTC
svn commit: r189771 - /httpd/httpd/branches/fips-dev/acinclude.m4
Author: ben
Date: Thu Jun 9 09:10:53 2005
New Revision: 189771
URL: http://svn.apache.org/viewcvs?rev=189771&view=rev
Log:
Make path check more portable, make specifying a local OpenSSL build
actually work.
Modified:
httpd/httpd/branches/fips-dev/acinclude.m4
Modified: httpd/httpd/branches/fips-dev/acinclude.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fips-dev/acinclude.m4?rev=189771&r1=189770&r2=189771&view=diff
==============================================================================
--- httpd/httpd/branches/fips-dev/acinclude.m4 (original)
+++ httpd/httpd/branches/fips-dev/acinclude.m4 Thu Jun 9 09:10:53 2005
@@ -341,8 +341,8 @@
if test "x$withval" != "xyes" -a "x$withval" != "x"; then
dnl This ensures $withval is actually a directory and that it is absolute
ap_ssltk_base="`cd $withval && pwd`"
- if test "x$ap_ssltk_base" == "x"; then
- exit
+ if test "x$ap_ssltk_base" = "x"; then
+ AC_MSG_ERROR([...$withval does not exist])
fi
fi
ap_ssltk_type="sslc"
@@ -352,8 +352,8 @@
if test "x$withval" != "xyes" -a "x$withval" != "x"; then
dnl This ensures $withval is actually a directory and that it is absolute
ap_ssltk_base="`cd $withval && pwd`"
- if test "x$ap_ssltk_base" == "x"; then
- exit
+ if test "x$ap_ssltk_base" = "x"; then
+ AC_MSG_ERROR([...$withval does not exist])
fi
fi
])
@@ -441,7 +441,7 @@
else
ap_ssltk_lib="$ap_ssltk_base"
fi
- LDFLAGS="$LDFLAGS -L$ap_ssltk_lib"
+ LDFLAGS="-L$ap_ssltk_lib $LDFLAGS"
fi
dnl make sure "other" flags are available so libcrypto and libssl can link
LIBS="$LIBS `$apr_config --libs`"
@@ -477,7 +477,7 @@
fi
dnl (c) hook up linker paths
if test "x$ap_ssltk_lib" != "x"; then
- APR_ADDTO(LDFLAGS, ["-L$ap_ssltk_lib"])
+ APR_SETVAR(LDFLAGS, [-L$ap_ssltk_lib $LDFLAGS])
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LDFLAGS, ["$ap_platform_runtime_link_flag$ap_ssltk_lib"])
fi
Re: svn commit: r189771 - /httpd/httpd/branches/fips-dev/acinclude.m4
Posted by Joe Orton <jo...@redhat.com>.
On Thu, Jun 09, 2005 at 04:10:54PM -0000, ben@apache.org wrote:
> Author: ben
> Date: Thu Jun 9 09:10:53 2005
> New Revision: 189771
>
> URL: http://svn.apache.org/viewcvs?rev=189771&view=rev
> Log:
> Make path check more portable, make specifying a local OpenSSL build
> actually work.
> @@ -441,7 +441,7 @@
> else
> ap_ssltk_lib="$ap_ssltk_base"
> fi
> - LDFLAGS="$LDFLAGS -L$ap_ssltk_lib"
> + LDFLAGS="-L$ap_ssltk_lib $LDFLAGS"
> fi
> dnl make sure "other" flags are available so libcrypto and libssl can link
> LIBS="$LIBS `$apr_config --libs`"
> @@ -477,7 +477,7 @@
> fi
> dnl (c) hook up linker paths
> if test "x$ap_ssltk_lib" != "x"; then
> - APR_ADDTO(LDFLAGS, ["-L$ap_ssltk_lib"])
> + APR_SETVAR(LDFLAGS, [-L$ap_ssltk_lib $LDFLAGS])
> if test "x$ap_platform_runtime_link_flag" != "x"; then
> APR_ADDTO(LDFLAGS, ["$ap_platform_runtime_link_flag$ap_ssltk_lib"])
> fi
These changes only make a difference if you've managed to get a
-L/usr/lib or similar in your LDFLAGS in which case all bets are off -
is that the case? Mucking around with the ordering is otherwise likely
to fix something for you and break something for some other guy.
joe