Author: dumindu
Date: Thu Feb 28 02:45:46 2008
New Revision: 14310
Log:
Fixed the build system according to the new directory structure
Added:
trunk/solutions/identity/modules/mod-cspace/Makefile.am
trunk/solutions/identity/modules/mod-cspace/src/Makefile.am
- copied, changed from r14280,
trunk/solutions/identity/modules/mod-cspace/Makefile.am
Modified:
trunk/solutions/identity/modules/mod-cspace/build.sh
trunk/solutions/identity/modules/mod-cspace/configure.ac
trunk/solutions/identity/modules/mod-cspace/test/test_validator.c
Added: trunk/solutions/identity/modules/mod-cspace/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/solutions/identity/modules/mod-cspace/Makefile.am Thu Feb 28
02:45:46 2008
@@ -0,0 +1 @@
+SUBDIRS = src test
Modified: trunk/solutions/identity/modules/mod-cspace/build.sh
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/build.sh (original)
+++ trunk/solutions/identity/modules/mod-cspace/build.sh Thu Feb 28
02:45:46 2008
@@ -1,6 +1,6 @@
#!/bin/sh
sh autogen.sh
-./configure
-#./configure --with-apxs2=/home/dumindu/software/httpd-2.2.8/deploy/bin/apxs
+#./configure
+./configure --with-apxs=/home/dumindu/software/httpd-2.2.8/deploy/bin/apxs
--with-apr-config=/home/dumindu/software/httpd-2.2.8/deploy/bin/apr-1-config
make
Modified: trunk/solutions/identity/modules/mod-cspace/configure.ac
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/configure.ac (original)
+++ trunk/solutions/identity/modules/mod-cspace/configure.ac Thu Feb 28
02:45:46 2008
@@ -113,19 +113,27 @@
PKG_CHECK_MODULES(APR1, apr-1)
CFLAGS="$CFLAGS $APR1_CFLAGS"
CPPFLAGS="$CPPFLAGS $APR1_CFLAGS"
+dnl LDFLAGS="$LDFLAGS $APR1_LDFLAGS"
PKG_CHECK_MODULES(APRUTIL1, apr-util-1)
CFLAGS="$CFLAGS $APRUTIL1_CFLAGS"
CPPFLAGS="$CPPFLAGS $APRUTIL1_CFLAGS"
+dnl LDFLAGS="$LDFLAGS $APRUTIL1_LDFLAGS"
else
- $apr_config --cppflags &> /dev/null
+ APR_CONFIG=${apr_config}
+ AC_SUBST(APR_CONFIG)
+
+ ${APR_CONFIG} --cppflags &> /dev/null
if test "$?" != "0"; then
- AC_MSG_ERROR($apr_config is not a valid apr-config program.)
+ AC_MSG_ERROR(${APR_CONFIG} is not a valid apr-config program.)
fi
- CFLAGS="$CFLAGS `${apr_config} --cflags` `${apr_config} --includes`"
- CPPFLAGS="$CPPFLAGS `${apr_config} --cppflags`"
+ CFLAGS="$CFLAGS `${APR_CONFIG} --cflags` `${APR_CONFIG} --includes`"
+ CPPFLAGS="$CPPFLAGS `${APR_CONFIG} --cppflags`"
+dnl LDFLAGS="$LDFLAGS `${apr_config} --ldflags`"
fi
+APR_LIBTOOL_FLAGS=`${APR_CONFIG} --link-ld`
+AC_SUBST(APR_LIBTOOL_FLAGS)
dnl AC_MSG_CHECKING(path to apxs)
dnl AC_ARG_WITH(apxs2,
@@ -185,7 +193,9 @@
dnl AC_SUBST(APACHE_LIBS)
AC_SUBST(VERSION_NO)
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([Makefile \
+ src/Makefile \
+ test/Makefile
])
AC_OUTPUT
Copied: trunk/solutions/identity/modules/mod-cspace/src/Makefile.am (from
r14280, trunk/solutions/identity/modules/mod-cspace/Makefile.am)
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/Makefile.am (original)
+++ trunk/solutions/identity/modules/mod-cspace/src/Makefile.am Thu Feb 28
02:45:46 2008
@@ -1,6 +1,6 @@
ACLOCAL_AMFLAGS=-I ${top_srcdir}/acinclude.d/
-noinst_LTLIBRARIES=libmod_cspace.la libdummy_ppid_validator.la
+noinst_LTLIBRARIES=libmod_cspace.la
noinst_DATA = mod_cspace.la
libmod_cspace_la_SOURCES= cspace_config.c \
@@ -10,9 +10,6 @@
cspace_validator.c \
mod_cspace.c
-
-libdummy_ppid_validator_la_SOURCES= dummy_ppid_validator.c
-
install-exec-local:
${APXS} -i -a -n 'cspace' mod_cspace.la
Modified: trunk/solutions/identity/modules/mod-cspace/test/test_validator.c
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/test/test_validator.c
(original)
+++ trunk/solutions/identity/modules/mod-cspace/test/test_validator.c Thu Feb
28 02:45:46 2008
@@ -26,7 +26,7 @@
int main() {
SSL_library_init();
- printf("%d\n", validate_with_op_mode("white", "uri", "issuer", "ppid",
cert_ok, "cert.pem"));
+ printf("%d\n", validate_with_op_mode("white", "uri", "issuer", "ppid",
cert_ok, "cert.pem", NULL));
return 0;
}
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
