labs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject svn commit: r603745 - in /labs/badca: build/ssl.m4 configure.ac openssl/setup.py.in
Date Wed, 12 Dec 2007 21:15:39 GMT
Author: dreid
Date: Wed Dec 12 13:15:38 2007
New Revision: 603745

URL: http://svn.apache.org/viewvc?rev=603745&view=rev
Log:
Remove an extra check for x509.h
Add better error handling for failure cases
Properly set python paths (D'oh!)
Properly set the libs path for libraries in setup.py

Modified:
    labs/badca/build/ssl.m4
    labs/badca/configure.ac
    labs/badca/openssl/setup.py.in

Modified: labs/badca/build/ssl.m4
URL: http://svn.apache.org/viewvc/labs/badca/build/ssl.m4?rev=603745&r1=603744&r2=603745&view=diff
==============================================================================
--- labs/badca/build/ssl.m4 (original)
+++ labs/badca/build/ssl.m4 Wed Dec 12 13:15:38 2007
@@ -60,8 +60,10 @@
       AC_SUBST(openssl_INCDIR)
       openssl_LIBDIR="$openssl_DIR/lib"
       AC_SUBST(openssl_LIBDIR)
-      openssl_LIBSONLY="ssl crypto"
+      openssl_LIBSONLY="'ssl', 'crypto'"
       AC_SUBST(openssl_LIBSONLY)
+    else
+      AC_ERROR([You MUSThave OpenSSL installed for BaDCA])
     fi  
   ]
 ) 

Modified: labs/badca/configure.ac
URL: http://svn.apache.org/viewvc/labs/badca/configure.ac?rev=603745&r1=603744&r2=603745&view=diff
==============================================================================
--- labs/badca/configure.ac (original)
+++ labs/badca/configure.ac Wed Dec 12 13:15:38 2007
@@ -8,8 +8,6 @@
 
 AC_PREFIX_DEFAULT(/usr/local/badca)
 
-AC_CHECK_HEADER(openssl/x509.h)
-
 PY_PYTHON_VERSION()
 PY_PYTHON_PREFIX()
 PY_PYTHON_EXEC_PREFIX()

Modified: labs/badca/openssl/setup.py.in
URL: http://svn.apache.org/viewvc/labs/badca/openssl/setup.py.in?rev=603745&r1=603744&r2=603745&view=diff
==============================================================================
--- labs/badca/openssl/setup.py.in (original)
+++ labs/badca/openssl/setup.py.in Wed Dec 12 13:15:38 2007
@@ -2,23 +2,23 @@
 
 rsaModule = Extension('rsa',
                       extra_link_args = ['-shared'],   
-                      include_dirs= [ @openssl_INCDIR@ ],
-                      library_dirs= [ @openssl_LIBDIR@ ],
-                      libraries = [ @openssl_LIBSONLY@ ],
+                      include_dirs= ['@openssl_INCDIR@'],
+                      library_dirs= ['@openssl_LIBDIR@'],
+                      libraries = [@openssl_LIBSONLY@],
                       sources = ['rsamodule.c']
                      )
 csrModule = Extension('csr',
                       extra_link_args = ['-shared'],
-                      include_dirs= [ @openssl_INCDIR@ ],
-                      library_dirs= [ @openssl_LIBDIR@ ],
-                      libraries = [ @openssl_LIBSONLY@ ],
+                      include_dirs= ['@openssl_INCDIR@'],
+                      library_dirs= ['@openssl_LIBDIR@'],
+                      libraries = [@openssl_LIBSONLY@],
                       sources = ['csrmodule.c']
                      )
 certModule = Extension('cert',
                        extra_link_args = ['-shared'],
-                       include_dirs= [ @openssl_INCDIR@ ],
-                       library_dirs= [ @openssl_LIBDIR@ ],
-                       libraries = [ @openssl_LIBSONLY@ ],
+                       include_dirs= ['@openssl_INCDIR@'],
+                       library_dirs= ['@openssl_LIBDIR@'],
+                       libraries = [@openssl_LIBSONLY@],
                        sources = ['certmodule.c']
                       )
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org


Mime
View raw message