Hi.

I noticed that there is not possible anymore to specify DBI during configure, 
as I didn't see anything mentioned that support for for example "MySQL" has 
been removed I ripped that from v0.9.1.8. The attached patch brings this 
back.

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 15:36:10.774745536 +0200
@@ -350,6 +350,55 @@
 	AC_SUBST( perl_use_lib)
 	AC_SUBST(PERL_MAKEFILE_OPTS)
 
+	AC_ARG_ENABLE( db,
+		AC_HELP_STRING( [--enable-db], [enable db module (default is yes)]),
+		db=$enableval, db=yes)
+	AC_SUBST( db)
+
+	AC_ARG_ENABLE( dbi,
+		AC_HELP_STRING( [--enable-dbi], [enable dbi module (default is no)]),
+		dbi=$enableval, dbi=no)
+	AC_SUBST( dbi)
+
+	dnl Special variables
+	if [[ "$dbi" = "yes" ]]; then
+		dbmodule=DBI;
+	else
+		dbmodule=DB;
+	fi
+
+	AC_SUBST( dbmodule)
+
+	AC_ARG_WITH( db_type,
+		AC_HELP_STRING( [--with-db-type=ARG], [sets DB-vendor (default is Pg)]),
+		db_type=$withval, db_type="Pg")
+	AC_SUBST( db_type)
+
+	AC_ARG_WITH( db_name,
+		AC_HELP_STRING( [--with-db-name=ARG], [sets DB name (default is openca)]),
+		db_name=$withval, db_name="openca")
+	AC_SUBST( db_name)
+
+	AC_ARG_WITH( db_host,
+		AC_HELP_STRING( [--with-db-host=ARG], [sets DB host (default is localhost)]),
+		db_host=$withval, db_host="localhost")
+	AC_SUBST( db_host)
+
+	AC_ARG_WITH( db_port,
+		AC_HELP_STRING( [--with-db-port=ARG], [sets DB port (default is 5432)]),
+		db_port=$withval, db_port="5432")
+	AC_SUBST( db_port)
+
+	AC_ARG_WITH( db_user,
+		AC_HELP_STRING( [--with-db-user=ARG], [sets DB user (default is openca)]),
+		db_user=$withval, db_user="openca")
+	AC_SUBST( db_user)
+
+	AC_ARG_WITH( db_passwd,
+		AC_HELP_STRING( [--with-db-passwd=ARG], [sets DB passwd]),
+		db_passwd=$withval, db_passwd="")
+	AC_SUBST( db_passwd)
+
 	dnl Check for program paths
 	AC_PATH_PROG( SHELL, bash, sh,
 		$PATH:/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin)
@@ -502,6 +551,7 @@
 		src/common/etc/loa.xml
 			src/common/etc/bp/bp.xml
 			src/common/etc/database/DB.conf
+			src/common/etc/database/DBI.conf
 			src/common/etc/openssl/sample-openssl.conf
 			src/common/etc/openssl/openssl.cnf
 				src/common/etc/openssl/openssl/CA_Operator.conf
diff -Naur openca-0.9.2-RC3/src/common/etc/database/DBI.conf.in openca-0.9.2-RC3.oden/src/common/etc/database/DBI.conf.in
--- openca-0.9.2-RC3/src/common/etc/database/DBI.conf.in	1970-01-01 01:00:00.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/common/etc/database/DBI.conf.in	2004-03-04 09:05:51.000000000 +0100
@@ -0,0 +1,45 @@
+<openca>
+    <database_config>
+        <debug>0</debug>
+        <type>@db_type@</type>
+        <name>@db_name@</name>
+        <host>@db_host@</host>
+        <port>@db_port@</port>
+        <user>@db_user@</user>
+        <passwd>@db_passwd@</passwd>
+        <environment>
+            <vendor>
+                 <type>DB2</type>
+                 <number>4</number>
+                 <option>
+                     <name>CLASSPATH</name>
+                     <value>/home/db2inst1/sqllib/java/sqlj.zip:/home/db2inst1/sqllib/function:/home/db2inst1/sqllib/java/db2java.zip:/home/db2inst1/sqllib/java/runtime.zip</value>
+                 </option>
+                 <option>
+                     <name>DB2INSTANCE</name>
+                     <value>db2inst1</value>
+                 </option>
+                 <option>
+                     <name>DB2DIR</name>
+                     <value>/usr/IBMdb2/V7.1</value>
+                 </option>
+                 <option>
+                     <name>INSTHOME</name>
+                     <value>/home/db2inst1</value>
+                 </option>
+            </vendor>
+            <vendor>
+                 <type>Pg</type>
+                 <number>0</number>
+            </vendor>
+            <vendor>
+                 <type>mysql</type>
+                 <number>0</number>
+            </vendor>
+            <vendor>
+                 <type>Oracle</type>
+                 <number>0</number>
+            </vendor>
+        </environment>
+    </database_config>
+</openca>
diff -Naur openca-0.9.2-RC3/src/common/etc/database/Makefile openca-0.9.2-RC3.oden/src/common/etc/database/Makefile
--- openca-0.9.2-RC3/src/common/etc/database/Makefile	2004-03-04 09:05:51.000000000 +0100
+++ openca-0.9.2-RC3.oden/src/common/etc/database/Makefile	2004-04-14 15:36:56.516791688 +0200
@@ -9,6 +9,7 @@
 
 # files derived from .in files:
 AC_FILES	= \
+	DBI.conf \
 	DB.conf
 
 TEMP_FILES	= \

Reply via email to