Merge pull request #53 from giacomini/ssl11-port

Porting to OpenSSL 1.1
italiangrid · Jan 25, 2017 · 8cc8d2f · 8cc8d2f
2 parents 77bd0ac + 30aaa78
commit 8cc8d2f
Show file tree

Hide file tree

Showing 43 changed files with 2,854 additions and 1,950 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([VOMS], [2.0.15])
+AC_INIT([VOMS], [2.1.0])
 AC_PREREQ(2.57)
 AC_CONFIG_AUX_DIR([./aux])
 AM_INIT_AUTOMAKE
@@ -31,7 +31,8 @@ AC_PROG_YACC
 AC_PROG_LEX
 AC_COMPILER
 
-PKG_CHECK_MODULES([OPENSSL], [openssl])
+#PKG_CHECK_MODULES([OPENSSL], [openssl])
+AC_OPENSSL
 
 PKG_CHECK_MODULES([GSOAP],[gsoap >= 2.7])
 PKG_CHECK_MODULES([GSOAP_PP],[gsoap++ >= 2.7])

diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
@@ -195,6 +195,17 @@ AC_DEFUN([AC_COMPILER],
       CXXFLAGS="-g -O0"
     fi
 
+    AC_ARG_WITH(profile,
+      [  --with-profile Compiles and links with collection of profile information activated],
+      [ac_with_profile="yes"],
+      [ac_with_profile="no"])
+    
+    if test "x$ac_with_profile" = "xyes" ; then
+      CFLAGS="$CFLAGS -pg"
+      CXXFLAGS="$CXXFLAGS -pg"
+      LDFLAGS="$LDFLAGS -pg"
+    fi
+
     AC_ARG_WITH(warnings,
       [  --with-warnings Compiles with maximum warnings],
       [ac_with_warnings="yes"],