2014-11-21 13:23:36 +00:00
|
|
|
diff -ru -x '*~' openssl_orig/configure openssl/configure
|
2014-11-29 13:01:38 +00:00
|
|
|
--- openssl_orig/configure 2014-11-08 02:32:33.000000000 +0900
|
|
|
|
|
+++ openssl/configure 2014-11-29 20:57:19.919495325 +0900
|
|
|
|
|
@@ -4,14 +4,15 @@
|
|
|
|
|
# if present, hence this script is not really required. On CRAN, we use
|
|
|
|
|
# the $OPENSSL_INCLUDES variable; elsewhere we assume to the standard
|
|
|
|
|
# linux location: /usr/include/openssl.
|
|
|
|
|
-if [ -z "$OPENSSL_INCLUDES" ]; then
|
|
|
|
|
- OPENSSL_INCLUDES="/usr/include"
|
|
|
|
|
-else
|
|
|
|
|
- echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars
|
2014-11-21 13:23:36 +00:00
|
|
|
-fi
|
2014-11-29 13:01:38 +00:00
|
|
|
+# if [ -z "$OPENSSL_INCLUDES" ]; then
|
|
|
|
|
+# OPENSSL_INCLUDES="/usr/include"
|
|
|
|
|
+# else
|
|
|
|
|
+# echo "PKG_CPPFLAGS= -I$OPENSSL_INCLUDES" >> src/Makevars
|
|
|
|
|
+# fi
|
|
|
|
|
|
|
|
|
|
-# Verify that openssl RNG is present
|
|
|
|
|
-if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then
|
|
|
|
|
- echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed."
|
2014-11-21 13:23:36 +00:00
|
|
|
- exit 1
|
|
|
|
|
-fi
|
2014-11-29 13:01:38 +00:00
|
|
|
+# # Verify that openssl RNG is present
|
|
|
|
|
+# if [ ! -e $OPENSSL_INCLUDES/openssl/rand.h ]; then
|
|
|
|
|
+# echo "File $OPENSSL_INCLUDES/rand.h not found. Make sure libssl-dev (deb) or openssl-devel (rpm) is installed."
|
|
|
|
|
+# exit 1
|
|
|
|
|
+# fi
|
2014-11-21 13:23:36 +00:00
|
|
|
+echo "PKG_LIBS= -L"${OPENSSL_HOME}/lib" -lssl -lcrypto" > src/Makevars
|
2014-11-29 13:01:38 +00:00
|
|
|
\ No newline at end of file
|
