Changeset 180 for trunk/configure.in

Timestamp:

28/04/07 23:56:58 (19 months ago)

Author:

smoku

Message:

Dynamically loading auth/reg/storage modules. Closes #52

Files:

• trunk/configure.in (modified) (15 diffs)

trunk/configure.in

@@ -29 +29 @@
 dnl basic tools
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_MAKE_SET
 
@@ -328 +329 @@
 AC_MSG_CHECKING([if user wants MySQL support])
 AC_ARG_ENABLE([mysql], 
-        AC_HELP_STRING([--enable-mysql], [enable MySQL authreg/storage support (no)]),
+        AC_HELP_STRING([--enable-mysql], [enable MySQL auth/reg/storage support (no)]),
         [enable_mysql=$enableval have_mysql=no],
         [enable_mysql=no         have_mysql=no])
@@ -368 +369 @@
 AC_MSG_CHECKING([if user wants PostgreSQL support])
 AC_ARG_ENABLE([pgsql], 
-        AC_HELP_STRING([--enable-pgsql], [enable PostgreSQL authreg/storage support (no)]),
+        AC_HELP_STRING([--enable-pgsql], [enable PostgreSQL auth/reg/storage support (no)]),
         [enable_pgsql=$enableval have_pgsql=no],
         [enable_pgsql=no         have_pgsql=no])
@@ -409 +410 @@
 AC_MSG_CHECKING([if user wants SQLite3 support])
 AC_ARG_ENABLE([sqlite],
-        AS_HELP_STRING([--enable-sqlite], [enable SQLite3 authreg/storage support (no)]),
+        AS_HELP_STRING([--enable-sqlite], [enable SQLite3 auth/reg/storage support (no)]),
         [enable_sqlite=$enableval have_sqlite=no],
         [enable_sqlite=no         have_sqlite=no])
@@ -430 +431 @@
                 
 dnl berkeley db
-AC_ARG_ENABLE(db, AC_HELP_STRING([--enable-db], [enable Berkeley DB authreg/storage support (no)]),
+AC_ARG_ENABLE(db, AC_HELP_STRING([--enable-db], [enable Berkeley DB auth/reg/storage support (no)]),
               want_db=$enableval, want_db=no)
 if test "x-$want_db" = "x-yes" ; then
@@ -466 +467 @@
         AC_MSG_ERROR([Berkeley DB >= 4.1.24 not found])
     else
-        AC_DEFINE(STORAGE_DB,1,[Define to 1 if you want to use Berkeley DB for authreg/storage.])
-    fi
-fi
+        DB_LIBS="-l$lib"
+        AC_DEFINE(STORAGE_DB,1,[Define to 1 if you want to use Berkeley DB for auth/reg/storage.])
+    fi
+fi
+AC_SUBST(DB_LIBS)
+AM_CONDITIONAL(STORAGE_DB, [test "x-$have_db_version" = "x-yes"])
 
 
@@ -495 +499 @@
                                        AC_MSG_RESULT(no))
     fi
-    if test "x-$want_ldap" = "x-yes" -a "x-$have_ldap_version" = "x-" ; then
+    if test "x-$have_ldap_version" = "x-" ; then
         AC_MSG_ERROR([OpenLDAP client libraries >= 2.1.0 not found])
     else
+        LDAP_LIBS="-llber -lldap"
         AC_DEFINE(STORAGE_LDAP,1,[Define to 1 if you want to use OpenLDAP for auth/reg.])
     fi
 fi
+AC_SUBST(LDAP_LIBS)
+AM_CONDITIONAL(STORAGE_LDAP, [test "x-$have_ldap_version" = "x-yes"])
 
 
@@ -514 +521 @@
         AC_MSG_ERROR([PAM application libraries not found])
     else
+        have_pam="yes"
+        PAM_LIBS="-lpam"
         AC_DEFINE(STORAGE_PAM,1,[Define to 1 if you want to use PAM for auth/reg.])
     fi
 fi
+AC_SUBST(PAM_LIBS)
+AM_CONDITIONAL(STORAGE_PAM, [test "x-$have_pam" = "x-yes"])
 
 
@@ -532 +543 @@
         AC_MSG_ERROR([Pipe auth/reg requirements (sys/wait.h, fork(), pipe(), wait()) not found])
     else
+        have_pipe="yes"
         AC_DEFINE(STORAGE_PIPE,1,[Define to 1 if you want to use pipes for auth/reg.])
     fi
 fi
+AM_CONDITIONAL(STORAGE_PIPE, [test "x-$have_pipe" = "x-yes"])
 
 
@@ -543 +556 @@
     AC_DEFINE(STORAGE_ANON,1,[Define to 1 if you want anonymous auth.])
 fi
+AM_CONDITIONAL(STORAGE_ANON, [test "x-$want_anon" = "x-yes"])
 
 
@@ -551 +565 @@
     AC_DEFINE(STORAGE_FS,1,[Define to 1 if you want to use the filesystem for storage.])
 fi
+AM_CONDITIONAL(STORAGE_FS, [test "x-$want_fs" = "x-yes"])
+
 
 dnl Oracle
@@ -557 +573 @@
         [ ac_oracle_home="$withval" ])
 
-AC_ARG_ENABLE(oracle, AC_HELP_STRING([--enable-oracle], [enable Oracle authreg/storage support (no)]),
+AC_ARG_ENABLE(oracle, AC_HELP_STRING([--enable-oracle], [enable Oracle auth/reg/storage support (no)]),
               want_oracle=$enableval, want_oracle=no)
 if test "x-$want_oracle" = "x-yes" ; then
@@ -578 +594 @@
                     CPPFLAGS="$save_cppflags"
                     LIBS="$save_libs"
-                     LDFLAGS="$save_ldflags"
+                    LDFLAGS="$save_ldflags"
                 fi
        fi
@@ -588 +604 @@
         AC_MSG_ERROR([Oracle client libraries not found])
     else
-        AC_DEFINE(STORAGE_ORACLE,1,[Define to 1 if you want to use Oracle for authreg/storage.])
-    fi
-fi
+        have_oracle="yes"
+        ORACLE_CPPFLAGS="-I$ac_oracle_home/rdbms/demo -I$ac_oracle_home/rdbms/public"
+        ORACLE_LIBS="-L$ac_oracle_home/lib"
+        ORACLE_LDFLAGS="-Wl,-rpath,$ac_oracle_home/lib"
+        AC_DEFINE(STORAGE_ORACLE,1,[Define to 1 if you want to use Oracle for auth/reg/storage.])
+    fi
+fi
+AC_SUBST(ORACLE_CPPFLAGS)
+AC_SUBST(ORACLE_LIBS)
+AC_SUBST(ORACLE_LDFLAGS)
+AM_CONDITIONAL(STORAGE_ORACLE, [test "x-$have_pam" = "x-yes"])
 
 
@@ -821 +845 @@
           s2s/Makefile \
           sm/Makefile \
+          storage/Makefile \
           Doxyfile)