--- openssl-ibmca-1.0.0-rc2/configure.in	2006/03/28 08:09:45	1.1
+++ openssl-ibmca-1.0.0-rc2/configure.in	2006/03/28 08:09:54
@@ -21,39 +21,16 @@
 	fi
 fi
 
-OPENSSL_LIB_DIR="/usr/local/ssl/lib"
+# OpenSSL location
+AC_MSG_CHECKING([OpenSSL])
+AC_CHECK_LIB(crypto, RAND_add, [LIBCRYPTO="-lcrypto"], \
+	     AC_MSG_ERROR([*** libcrypto not found])) 
 
 # libica
 AC_MSG_CHECKING([libICA])
 AC_CHECK_LIB(ica, icaOpenAdapter, [LIBICA="-lica"], \
-             AC_MSG_ERROR([*** libICA not found]))
-
-# OpenSSL location
-AC_MSG_CHECKING([OpenSSL location])
-AC_ARG_WITH(openssl,
-	[  --with-openssl=PATH     Location of openssl libs/includes],
-	[OPENSSL_INCLUDE_DIR="$withval/include"
-	 OPENSSL_LIB_DIR="$withval/lib"
-	 if [[ ! -d $OPENSSL_INCLUDE_DIR -o ! -d $OPENSSL_LIB_DIR ]]; then
-		AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
-	 else
-		AC_MSG_RESULT([yes])
-		CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
-	 fi],
-	[AC_MSG_RESULT([no])
-	 AC_SUBST([OPENSSL_LIB_DIR], [/usr/local/ssl/lib])
-	 AC_SUBST([OPENSSL_INCLUDE_DIR], [/usr/local/ssl/include]) ] )
-
-# Is the library specified?
-AC_MSG_CHECKING([Engines library directory])
-AC_ARG_WITH(engines-dir,
-	    [  --with-engines-dir=PATH Location of OpenSSL engines],
-	    [OPENSSL_ENGINES_DIR="$withval/"],
-	    [AC_MSG_RESULT([no])
-	     AC_SUBST([OPENSSL_ENGINES_DIR], [$OPENSSL_LIB_DIR/engines])])
+             AC_MSG_ERROR([*** libICA not found]),-lssl)
 
-# for the correct install target
-libdir=$OPENSSL_ENGINES_DIR
 
 AC_DISABLE_STATIC
 AC_PROG_CC
@@ -61,6 +38,8 @@
 
 CFLAGS="$CFLAGS -Wall"
 AC_SUBST(CFLAGS)
+AC_SUBST(LIBCRYPTO)
+AC_SUBST(LIBICA)
 
 AC_OUTPUT(Makefile openssl.cnf.sample)
 
--- openssl-ibmca-1.0.0-rc2/Makefile.am	2006/03/28 08:06:46	1.1
+++ openssl-ibmca-1.0.0-rc2/Makefile.am	2006/03/28 08:07:34
@@ -1,7 +1,4 @@
 lib_LTLIBRARIES=libibmca.la
 
-libibmca_la_LIBADD=@OPENSSL_LIB_DIR@/libcrypto.a
-libibmca_la_LDFLAGS=-lc
-libibmca_la_CFLAGS=-I@OPENSSL_INCLUDE_DIR@
-AM_CFLAGS=-I@OPENSSL_INCLUDE_DIR@
+libibmca_la_LDFLAGS=@LIBICA@ @LIBCRYPTO@ -lc
 libibmca_la_SOURCES=e_ibmca.c e_ibmca.h e_ibmca_err.c