Hi.

The attached patch makes:

--with-ca-htdocs-url-prefix=DIR
--with-ca-cgi-url-prefix=DIR

work again.

Cheers.
-- 
Regards // Oden Eriksson
diff -Naur openca-0.9.2-RC3/configure.in openca-0.9.2-RC3.oden/configure.in
--- openca-0.9.2-RC3/configure.in	2004-03-04 09:05:42.000000000 +0100
+++ openca-0.9.2-RC3.oden/configure.in	2004-04-14 16:37:26.156002656 +0200
@@ -257,56 +257,111 @@
 		ca_htdocs_fs_prefix=$withval, ca_htdocs_fs_prefix=$htdocs_fs_prefix/ca)
 	AC_SUBST( ca_htdocs_fs_prefix)
 
+	AC_ARG_WITH( ca-htdocs-url-prefix,
+		AC_HELP_STRING( [--with-ca-htdocs-url-prefix=DIR], [sets CA htdocs URL-prefix (default is HTDOCSURLPREFIX/ca)]),
+		ca_htdocs_url_prefix=$withval, ca_htdocs_url_prefix=$htdocs_url_prefix/ca )
+	AC_SUBST( ca_htdocs_url_prefix)
+
 	AC_ARG_WITH( ca-cgi-fs-prefix,
 		AC_HELP_STRING( [--with-ca-cgi-fs-prefix=DIR], [sets CA cgi directory (default is CGIFSPREFIX/ca)]),
 		ca_cgi_fs_prefix=$withval, ca_cgi_fs_prefix=$cgi_fs_prefix/ca)
 	AC_SUBST( ca_cgi_fs_prefix)
 
+	AC_ARG_WITH( ca-cgi-url-prefix,
+		AC_HELP_STRING( [--with-ca-cgi-url-prefix=DIR], [sets CA cgi URL-prefix (default is CGIURLPREFIX/ca)]),
+		ca_cgi_url_prefix=$withval, ca_cgi_url_prefix=$cgi_url_prefix/ca)
+	AC_SUBST( ca_cgi_url_prefix)
+
 	AC_ARG_WITH( node-htdocs-fs-prefix,
 		AC_HELP_STRING( [--with-node-htdocs-fs-prefix=DIR], [sets Node management htdocs directory (default is HTDOCSFSPREFIX/NODEPREFIX)]),
 		node_htdocs_fs_prefix=$withval, node_htdocs_fs_prefix=$htdocs_fs_prefix/$node_prefix)
 	AC_SUBST( node_htdocs_fs_prefix)
 
+	AC_ARG_WITH( node-htdocs-url-prefix,
+		AC_HELP_STRING( [--with-node-htdocs-url-prefix=DIR], [sets Node management htdocs URL-prefix (default is HTDOCSURLPREFIX/NODEPREFIX)]),
+		node_htdocs_url_prefix=$withval, node_htdocs_url_prefix=$htdocs_url_prefix/$node_prefix)
+	AC_SUBST( node_htdocs_url_prefix)
+
 	AC_ARG_WITH( node-cgi-fs-prefix,
 		AC_HELP_STRING( [--with-node-cgi-fs-prefix=DIR], [sets Node management cgi directory (default is CGIFSPREFIX/NODEPREFIX)]),
 		node_cgi_fs_prefix=$withval, node_cgi_fs_prefix=$cgi_fs_prefix/$node_prefix)
 	AC_SUBST( node_cgi_fs_prefix)
 
+	AC_ARG_WITH( node-cgi-url-prefix,
+		AC_HELP_STRING( [--with-node-cgi-url-prefix=DIR], [sets Node management cgi URL-prefix (default is CGIURLPREFIX/NODEPREFIX)]),
+		node_cgi_url_prefix=$withval, node_cgi_url_prefix=$cgi_url_prefix/$node_prefix)
+	AC_SUBST( node_cgi_url_prefix)
+
 	AC_ARG_WITH( ra-htdocs-fs-prefix,
 		AC_HELP_STRING( [--with-ra-htdocs-fs-prefix=DIR], [sets RA htdocs directory (default is HTDOCSFSPREFIX/ra)]),
 		ra_htdocs_fs_prefix=$withval, ra_htdocs_fs_prefix=$htdocs_fs_prefix/ra)
 	AC_SUBST( ra_htdocs_fs_prefix)
 
+	AC_ARG_WITH( ra-htdocs-url-prefix,
+		AC_HELP_STRING( [--with-ra-htdocs-url-prefix=DIR], [sets RA htdocs URL-prefix (default is HTDOCSURLPREFIX/ra)]),
+		ra_htdocs_url_prefix=$withval, ra_htdocs_url_prefix=$htdocs_url_prefix/ra)
+	AC_SUBST( ra_htdocs_url_prefix)
+
 	AC_ARG_WITH( ra-cgi-fs-prefix,
 		AC_HELP_STRING( [--with-ra-cgi-fs-prefix=DIR], [sets RA cgi directory (default is CGIFSPREFIX/ra)]),
 		ra_cgi_fs_prefix=$withval, ra_cgi_fs_prefix=$cgi_fs_prefix/ra)
 	AC_SUBST( ra_cgi_fs_prefix)
 
+	AC_ARG_WITH( ra-cgi-url-prefix,
+		AC_HELP_STRING( [--with-ra-cgi-url-prefix=DIR], [sets RA cgi URL-prefix (default is CGIURLPREFIX/ra)]),
+		ra_cgi_url_prefix=$withval, ra_cgi_url_prefix=$cgi_url_prefix/ra)
+	AC_SUBST( ra_cgi_url_prefix)
+
 	AC_ARG_WITH( ldap-htdocs-fs-prefix,
 		AC_HELP_STRING( [--with-ldap-htdocs-fs-prefix=DIR], [sets LDAP htdocs directory (default is HTDOCSFSPREFIX/ldap)]),
 		ldap_htdocs_fs_prefix=$withval, ldap_htdocs_fs_prefix=$htdocs_fs_prefix/ldap)
 	AC_SUBST( ldap_htdocs_fs_prefix)
 
+	AC_ARG_WITH( ldap-htdocs-url-prefix,
+		AC_HELP_STRING( [--with-ldap-htdocs-url-prefix=DIR], [sets LDAP htdocs URL-prefix (default is HTDOCSURLPREFIX/ldap)]),
+		ldap_htdocs_url_prefix=$withval, ldap_htdocs_url_prefix=$htdocs_url_prefix/ldap)
+	AC_SUBST( ldap_htdocs_url_prefix)
+
 	AC_ARG_WITH( ldap-cgi-fs-prefix,
 		AC_HELP_STRING( [--with-ldap-cgi-fs-prefix=DIR], [sets LDAP cgi directory (default is CGIFSPREFIX/ldap)]),
 		ldap_cgi_fs_prefix=$withval, ldap_cgi_fs_prefix=$cgi_fs_prefix/ldap)
 	AC_SUBST( ldap_cgi_fs_prefix)
 
+	AC_ARG_WITH( ldap-cgi-url-prefix,
+		AC_HELP_STRING( [--with-ldap-cgi-url-prefix=DIR], [sets LDAP cgi URL-prefix (default is CGIURLPREFIX/ldap)]),
+		ldap_cgi_url_prefix=$withval, ldap_cgi_url_prefix=$cgi_url_prefix/ldap)
+	AC_SUBST( ldap_cgi_url_prefix)
+
 	AC_ARG_WITH( pub-htdocs-fs-prefix,
 		AC_HELP_STRING( [--with-pub-htdocs-fs-prefix=DIR], [sets public htdocs directory (default is HTDOCSFSPREFIX/pub)]),
 		pub_htdocs_fs_prefix=$withval, pub_htdocs_fs_prefix=$htdocs_fs_prefix/pub)
 	AC_SUBST( pub_htdocs_fs_prefix)
 
+	AC_ARG_WITH( pub-htdocs-url-prefix,
+		AC_HELP_STRING( [--with-pub-htdocs-url-prefix=DIR], [sets public htdocs URL-prefix (default is HTDOCSURLPREFIX/pub)]),
+		pub_htdocs_url_prefix=$withval, pub_htdocs_url_prefix=$htdocs_url_prefix/pub)
+	AC_SUBST( pub_htdocs_url_prefix)
+
 	AC_ARG_WITH( pub-cgi-fs-prefix,
 		AC_HELP_STRING( [--with-pub-cgi-fs-prefix=DIR], [sets public cgi directory (default is CGIFSPREFIX/pub)]),
 		pub_cgi_fs_prefix=$withval, pub_cgi_fs_prefix=$cgi_fs_prefix/pub)
 	AC_SUBST( pub_cgi_fs_prefix)
 
+	AC_ARG_WITH( pub-cgi-url-prefix,
+		AC_HELP_STRING( [--with-pub-cgi-url-prefix=DIR], [sets public cgi URL-prefix (default is CGIURLPREFIX/pub)]),
+		pub_cgi_url_prefix=$withval, pub_cgi_url_prefix=$cgi_url_prefix/pub)
+	AC_SUBST( pub_cgi_url_prefix)
+
 	AC_ARG_WITH( scep-cgi-fs-prefix,
 		AC_HELP_STRING( [--with-scep-cgi-fs-prefix=DIR], [sets SCEP cgi directory (default is CGIFSPREFIX/scep)]),
 		scep_cgi_fs_prefix=$withval, scep_cgi_fs_prefix=$cgi_fs_prefix/scep)
 	AC_SUBST( scep_cgi_fs_prefix)
 
+	AC_ARG_WITH( scep-cgi-url-prefix,
+		AC_HELP_STRING( [--with-scep-cgi-url-prefix=DIR], [sets scep cgi URL-prefix (default is CGIURLPREFIX/scep)]),
+		scep_cgi_url_prefix=$withval, scep_cgi_url_prefix=$cgi_url_prefix/scep)
+	AC_SUBST( scep_cgi_url_prefix)
+
 	dnl                       configuration for apache
 	dnl ############################### END ##############################
 
@@ -532,18 +587,23 @@
 		src/web-interfaces/ca/ca
 		src/web-interfaces/ca/access_control.xml
 		src/web-interfaces/ca/ca.conf
+		src/web-interfaces/ca/htdocs/index.html
 		src/web-interfaces/ldap/ldap
 		src/web-interfaces/ldap/access_control.xml
 		src/web-interfaces/ldap/ldap.conf
+		src/web-interfaces/ldap/htdocs/index.html
 		src/web-interfaces/node/node
 		src/web-interfaces/node/access_control.xml
 		src/web-interfaces/node/node.conf
+		src/web-interfaces/node/htdocs/index.html
 		src/web-interfaces/pub/pki
 		src/web-interfaces/pub/access_control.xml
 		src/web-interfaces/pub/public.conf
+		src/web-interfaces/pub/htdocs/index.html
 		src/web-interfaces/ra/RAServer
 		src/web-interfaces/ra/access_control.xml
 		src/web-interfaces/ra/ra.conf
+		src/web-interfaces/ra/htdocs/index.html
 		src/web-interfaces/scep/scep
 		src/web-interfaces/scep/access_control.xml
 		src/web-interfaces/scep/scep.conf
diff -Naur openca-0.9.2-RC3/src/web-interfaces/ca/htdocs/index.html.in openca-0.9.2-RC3.oden/src/web-interfaces/ca/htdocs/index.html.in
--- openca-0.9.2-RC3/src/web-interfaces/ca/htdocs/index.html.in	1970-01-01 01:00:00.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/ca/htdocs/index.html.in	2004-04-14 16:00:21.742164960 +0200
@@ -0,0 +1,13 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Massimiliano Pala">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en] (X11; I; Linux 2.0.34 i686) [Netscape]">
+   <meta http-equiv="refresh" content="0; [EMAIL PROTECTED]@/ca?cmd=getStaticPage&name=index">
+</HEAD>
+<BODY TEXT="#264A8D" BGCOLOR="#FFFFFF" LINK="#FF7000" VLINK="#E15100" ALINK="#FF0000">
+  <a href="@ca_cgi_url_prefix@/ca?cmd=getStaticPage&name=index">Enter CA</a>
+&nbsp;
+</BODY>
+</HTML>
+
diff -Naur openca-0.9.2-RC3/src/web-interfaces/ca/htdocs/Makefile openca-0.9.2-RC3.oden/src/web-interfaces/ca/htdocs/Makefile
--- openca-0.9.2-RC3/src/web-interfaces/ca/htdocs/Makefile	2004-03-04 09:05:48.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/ca/htdocs/Makefile	2004-04-14 15:59:49.021139312 +0200
@@ -12,15 +12,17 @@
 	images	\
 	scripts
 
-STATIC_FILES	= \
+AC_FILES	= \
 	index.html
 
+STATIC_FILES	= 	
+
 STYLESHEETS	= \
 	default.css \
 	main-openca.css \
 	menu-openca.css
 
-FILES		= $(STATIC_FILES)
+FILES		= $(AC_FILES) $(STATIC_FILES)
 
 DEST_FILES	= $(FILES:%=$(DEST_CA_HTDOCDIR)/%)
 
@@ -49,7 +51,7 @@
 		$(LN_S) $(DEST_LIB_STYLESHEET_DIR)/$@
 
 distclean::
-		#$(RM)
+		#$(RM) $(AC_FILES)
 
 install clean distclean::
 		$(MAKE) $(SUBDIRS) SUBTARGET=$@
diff -Naur openca-0.9.2-RC3/src/web-interfaces/ldap/htdocs/index.html.in openca-0.9.2-RC3.oden/src/web-interfaces/ldap/htdocs/index.html.in
--- openca-0.9.2-RC3/src/web-interfaces/ldap/htdocs/index.html.in	1970-01-01 01:00:00.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/ldap/htdocs/index.html.in	2004-04-14 16:01:07.227250176 +0200
@@ -0,0 +1,12 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Massimiliano Pala">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en] (X11; I; Linux 2.0.34 i686) [Netscape]">
+   <meta http-equiv="refresh" content="0; [EMAIL PROTECTED]@/ldap?cmd=getStaticPage&name=index">
+</HEAD>
+<BODY TEXT="#264A8D" BGCOLOR="#FFFFFF" LINK="#FF7000" VLINK="#E15100" ALINK="#FF0000">
+    <a href="@ldap_cgi_url_prefix@/ldap?cmd=getStaticPage&name=index">Enter LDAP Gateway</a>
+&nbsp;
+</BODY>
+</HTML>
diff -Naur openca-0.9.2-RC3/src/web-interfaces/ldap/htdocs/Makefile openca-0.9.2-RC3.oden/src/web-interfaces/ldap/htdocs/Makefile
--- openca-0.9.2-RC3/src/web-interfaces/ldap/htdocs/Makefile	2004-03-04 09:05:48.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/ldap/htdocs/Makefile	2004-04-14 16:02:30.477594200 +0200
@@ -11,15 +11,17 @@
 SUBDIRS	= \
 	images
 
-STATIC_FILES	= \
+AC_FILES	= \
 	index.html
 
+STATIC_FILES	= 
+
 STYLESHEETS	= \
 	default.css \
 	main-openca.css \
 	menu-openca.css
 
-FILES		= $(STATIC_FILES)
+FILES		= $(AC_FILES) $(STATIC_FILES)
 
 DEST_FILES	= $(FILES:%=$(DEST_LDAP_HTDOCDIR)/%)
 
@@ -48,7 +50,7 @@
 		$(LN_S) $(DEST_LIB_STYLESHEET_DIR)/$@
 
 distclean::
-		#$(RM)
+		#$(RM) $(AC_FILES)
 
 install clean distclean::
 		$(MAKE) $(SUBDIRS) SUBTARGET=$@
diff -Naur openca-0.9.2-RC3/src/web-interfaces/node/htdocs/index.html.in openca-0.9.2-RC3.oden/src/web-interfaces/node/htdocs/index.html.in
--- openca-0.9.2-RC3/src/web-interfaces/node/htdocs/index.html.in	1970-01-01 01:00:00.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/node/htdocs/index.html.in	2004-04-14 16:03:06.522114600 +0200
@@ -0,0 +1,12 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Massimiliano Pala">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en] (X11; I; Linux 2.0.34 i686) [Netscape]">
+   <meta http-equiv="refresh" content="0; [EMAIL PROTECTED]@/node?cmd=getStaticPage&name=index">
+</HEAD>
+<BODY TEXT="#264A8D" BGCOLOR="#FFFFFF" LINK="#FF7000" VLINK="#E15100" ALINK="#FF0000">
+    <a href="@node_cgi_url_prefix@/node?cmd=getStaticPage&name=index">Enter Node Management</a>
+&nbsp;
+</BODY>
+</HTML>
diff -Naur openca-0.9.2-RC3/src/web-interfaces/node/htdocs/Makefile openca-0.9.2-RC3.oden/src/web-interfaces/node/htdocs/Makefile
--- openca-0.9.2-RC3/src/web-interfaces/node/htdocs/Makefile	2004-03-04 09:05:49.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/node/htdocs/Makefile	2004-04-14 16:03:52.938058304 +0200
@@ -11,15 +11,17 @@
 SUBDIRS	= \
 	images
 
-STATIC_FILES	= \
+AC_FILES	= \
 	index.html
 
+STATIC_FILES	= 
+
 STYLESHEETS	= \
 	default.css \
 	main-openca.css \
 	menu-openca.css
 
-FILES		= $(STATIC_FILES)
+FILES		= $(AC_FILES) $(STATIC_FILES)
 
 DEST_FILES	= $(FILES:%=$(DEST_NODE_HTDOC_DIR)/%)
 
@@ -48,7 +50,7 @@
 		$(LN_S) $(DEST_LIB_STYLESHEET_DIR)/$@
 
 distclean::
-		#$(RM)
+		#$(RM) $(AC_FILES)
 
 install clean distclean::
 		$(MAKE) $(SUBDIRS) SUBTARGET=$@
diff -Naur openca-0.9.2-RC3/src/web-interfaces/pub/htdocs/index.html.in openca-0.9.2-RC3.oden/src/web-interfaces/pub/htdocs/index.html.in
--- openca-0.9.2-RC3/src/web-interfaces/pub/htdocs/index.html.in	1970-01-01 01:00:00.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/pub/htdocs/index.html.in	2004-04-14 16:04:38.611114944 +0200
@@ -0,0 +1,12 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Massimiliano Pala">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en] (X11; I; Linux 2.0.34 i686) [Netscape]">
+   <meta http-equiv="refresh" content="0; [EMAIL PROTECTED]@/pki?cmd=getStaticPage&name=index">
+</HEAD>
+<BODY TEXT="#264A8D" BGCOLOR="#FFFFFF" LINK="#FF7000" VLINK="#E15100" ALINK="#FF0000">
+    <a href="@pub_cgi_url_prefix@/pki?cmd=getStaticPage&name=index">Enter Public Gateway</a>
+&nbsp;
+</BODY>
+</HTML>
diff -Naur openca-0.9.2-RC3/src/web-interfaces/pub/htdocs/Makefile openca-0.9.2-RC3.oden/src/web-interfaces/pub/htdocs/Makefile
--- openca-0.9.2-RC3/src/web-interfaces/pub/htdocs/Makefile	2004-03-04 09:05:48.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/pub/htdocs/Makefile	2004-04-14 16:05:31.316102568 +0200
@@ -14,15 +14,17 @@
 	images	\
 	scripts
 
-STATIC_FILES	= \
+AC_FILES	= \
 	index.html
 
+STATIC_FILES	= 
+
 STYLESHEETS	= \
 	default.css \
 	main-openca.css \
 	menu-openca.css
 
-FILES		= $(STATIC_FILES)
+FILES		= $(AC_FILES) $(STATIC_FILES)
 
 DEST_FILES	= $(FILES:%=$(DEST_PUB_HTDOCDIR)/%)
 
@@ -51,7 +53,7 @@
 		$(LN_S) $(DEST_LIB_STYLESHEET_DIR)/$@
 
 distclean::
-		#$(RM)
+		#$(RM) $(AC_FILES)
 
 install clean distclean::
 		$(MAKE) $(SUBDIRS) SUBTARGET=$@
diff -Naur openca-0.9.2-RC3/src/web-interfaces/ra/htdocs/index.html.in openca-0.9.2-RC3.oden/src/web-interfaces/ra/htdocs/index.html.in
--- openca-0.9.2-RC3/src/web-interfaces/ra/htdocs/index.html.in	1970-01-01 01:00:00.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/ra/htdocs/index.html.in	2004-04-14 16:05:50.796141152 +0200
@@ -0,0 +1,12 @@
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="Author" CONTENT="Massimiliano Pala">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en] (X11; I; Linux 2.0.34 i686) [Netscape]">
+   <meta http-equiv="refresh" content="0; [EMAIL PROTECTED]@/RAServer?cmd=getStaticPage&name=index">
+</HEAD>
+<BODY TEXT="#264A8D" BGCOLOR="#FFFFFF" LINK="#FF7000" VLINK="#E15100" ALINK="#FF0000">
+    <a href="@ra_cgi_url_prefix@/RAServer?cmd=getStaticPage&name=index">Enter RA</a>
+&nbsp;
+</BODY>
+</HTML>
diff -Naur openca-0.9.2-RC3/src/web-interfaces/ra/htdocs/Makefile openca-0.9.2-RC3.oden/src/web-interfaces/ra/htdocs/Makefile
--- openca-0.9.2-RC3/src/web-interfaces/ra/htdocs/Makefile	2004-03-04 09:05:48.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/web-interfaces/ra/htdocs/Makefile	2004-04-14 16:06:26.877655928 +0200
@@ -13,15 +13,17 @@
 	images		\
 	scripts
 
-STATIC_FILES	= \
+AC_FILES	= \
 	index.html
 
+STATIC_FILES	= 
+
 STYLESHEETS	= \
 	default.css \
 	main-openca.css \
 	menu-openca.css
 
-FILES		= $(STATIC_FILES)
+FILES		= $(AC_FILES) $(STATIC_FILES)
 
 DEST_FILES	= $(FILES:%=$(DEST_RA_HTDOCDIR)/%)
 
@@ -50,7 +52,7 @@
 		$(LN_S) $(DEST_LIB_STYLESHEET_DIR)/$@
 
 distclean::
-		#$(RM)
+		#$(RM) $(AC_FILES)
 
 install clean distclean::
 		$(MAKE) $(SUBDIRS) SUBTARGET=$@

Reply via email to