INN commit: trunk (Makefile Makefile.global.in configure.ac)

[INN Commit]

    Date: Wednesday, August 1, 2007 @ 06:07:24
  Author: iulius
Revision: 7615

Fix the path to OpenSSL binary (used by make cert).

Modified:
  trunk/Makefile
  trunk/Makefile.global.in
  trunk/configure.ac

--------------------+
 Makefile           |    2 +-
 Makefile.global.in |    4 +++-
 configure.ac       |    2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2007-08-01 12:55:46 UTC (rev 7614)
+++ Makefile	2007-08-01 13:07:24 UTC (rev 7615)
@@ -116,7 +116,7 @@
 
 ##  Install a certificate for TLS/SSL support.
 cert:
-	$(SSLBIN)/openssl req -new -x509 -nodes \
+	$(SSLBIN) req -new -x509 -nodes \
 	    -out $(PATHLIB)/cert.pem -days 366 \
 	    -keyout $(PATHLIB)/key.pem
 	chown $(NEWSUSER) $(PATHLIB)/cert.pem

Modified: Makefile.global.in
===================================================================
--- Makefile.global.in	2007-08-01 12:55:46 UTC (rev 7614)
+++ Makefile.global.in	2007-08-01 13:07:24 UTC (rev 7615)
@@ -147,6 +147,8 @@
 SSL_LDFLAGS	= @SSL_LDFLAGS@
 SSL_LIBS	= @SSL_LIBS@
 
+SSLBIN		= @SSLBIN@
+
 ##  SASL support.  Additional flags and libraries used when compiling or
 ##  linking code that contains SASL support.
 
@@ -185,8 +187,8 @@
 LN_S		= @LN_S@
 PERL		= @PERL@
 RANLIB		= @RANLIB@
+UNCOMPRESS	= @UNCOMPRESS@
 YACC		= @YACC@
-UNCOMPRESS	= @UNCOMPRESS@
 
 FIXCONFIG	= $(top)/support/fixconfig
 FIXSCRIPT	= $(top)/support/fixscript

Modified: configure.ac
===================================================================
--- configure.ac	2007-08-01 12:55:46 UTC (rev 7614)
+++ configure.ac	2007-08-01 13:07:24 UTC (rev 7615)
@@ -247,11 +247,13 @@
 AC_ARG_VAR([EGREP], [Location of egrep])
 AC_ARG_VAR([SED], [Location of sed])
 AC_ARG_VAR([SORT], [Location of sort])
+AC_ARG_VAR([SSLBIN], [Location of openssl])
 AC_ARG_VAR([UUX], [Location of uux])
 INN_PATH_PROG_ENSURE([AWK], [awk])
 INN_PATH_PROG_ENSURE([EGREP], [egrep])
 INN_PATH_PROG_ENSURE([SED], [sed])
 INN_PATH_PROG_ENSURE([SORT], [sort])
+AC_PATH_PROGS([SSLBIN], [openssl], [openssl])
 AC_PATH_PROGS([UUX], [uux], [uux])
 INN_PATH_COMPRESS
 INN_PATH_SENDMAIL