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 16:57:37 UTC
svn commit: r189761 - /httpd/httpd/branches/fips-dev/acinclude.m4
Author: ben
Date: Thu Jun 9 07:57:36 2005
New Revision: 189761
URL: http://svn.apache.org/viewcvs?rev=189761&view=rev
Log:
Die properly when path is bollocks.
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=189761&r1=189760&r2=189761&view=diff
==============================================================================
--- httpd/httpd/branches/fips-dev/acinclude.m4 (original)
+++ httpd/httpd/branches/fips-dev/acinclude.m4 Thu Jun 9 07:57:36 2005
@@ -340,7 +340,10 @@
dnl If --with-sslc specifies a directory, we use that directory or fail
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`"
+ ap_ssltk_base="`cd $withval && pwd`"
+ if test "x$ap_ssltk_base" == "x"; then
+ exit
+ fi
fi
ap_ssltk_type="sslc"
])
@@ -348,7 +351,10 @@
dnl If --with-ssl specifies a directory, we use that directory or fail
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`"
+ ap_ssltk_base="`cd $withval && pwd`"
+ if test "x$ap_ssltk_base" == "x"; then
+ exit
+ fi
fi
])
if test "x$ap_ssltk_base" = "x"; then
Re: svn commit: r189761 - /httpd/httpd/branches/fips-dev/acinclude.m4
Posted by Ben Laurie <be...@algroup.co.uk>.
Joe Orton wrote:
> On Thu, Jun 09, 2005 at 02:57:37PM -0000, ben@apache.org wrote:
>
>>Author: ben
>>Date: Thu Jun 9 07:57:36 2005
>>New Revision: 189761
>>
>>URL: http://svn.apache.org/viewcvs?rev=189761&view=rev
>>Log:
>>Die properly when path is bollocks.
>
>
> Did you mean to commit this to the branch? (given that it's not
> FIPS-specific)
Well, I should probably also commit to the head, its true. But I hope
the long-term plan will be to take the whole FIPS branch to head.
> - "test x == y" is not portable, s/==/=/
OK.
> - don't exit, use AC_MSG_ERROR and pass an error message
OK. autoconf sucks.
> - whitespace should be spaces not tabs
OK.
--
>>>ApacheCon Europe<<< http://www.apachecon.com/
http://www.apache-ssl.org/ben.html http://www.thebunker.net/
"There is no limit to what a man can do or how far he can go if he
doesn't mind who gets the credit." - Robert Woodruff
Re: svn commit: r189761 - /httpd/httpd/branches/fips-dev/acinclude.m4
Posted by Joe Orton <jo...@redhat.com>.
On Thu, Jun 09, 2005 at 02:57:37PM -0000, ben@apache.org wrote:
> Author: ben
> Date: Thu Jun 9 07:57:36 2005
> New Revision: 189761
>
> URL: http://svn.apache.org/viewcvs?rev=189761&view=rev
> Log:
> Die properly when path is bollocks.
Did you mean to commit this to the branch? (given that it's not
FIPS-specific)
- "test x == y" is not portable, s/==/=/
- don't exit, use AC_MSG_ERROR and pass an error message
- whitespace should be spaces not tabs
> 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=189761&r1=189760&r2=189761&view=diff
> ==============================================================================
> --- httpd/httpd/branches/fips-dev/acinclude.m4 (original)
> +++ httpd/httpd/branches/fips-dev/acinclude.m4 Thu Jun 9 07:57:36 2005
> @@ -340,7 +340,10 @@
> dnl If --with-sslc specifies a directory, we use that directory or fail
> 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`"
> + ap_ssltk_base="`cd $withval && pwd`"
> + if test "x$ap_ssltk_base" == "x"; then
> + exit
> + fi
...