From cc6febdd37186eeea33bcbce89d79f661ee0009f Mon Sep 17 00:00:00 2001 From: Konrad Lipinski Date: Tue, 11 Jun 2019 16:25:51 +0200 Subject: Import upstream commit c4d0493d545b99194eea1b2b058930d5a9bb91b1 (1.2.28) Change-Id: I10f71567cb140be223923e1cd0b5895e366ac23e --- configure.ac | 2319 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 1536 insertions(+), 783 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ab69e164..8e01f84f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,16 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([xmlsec1],[1.2.22],[http://www.aleksey.com/xmlsec]) +AC_INIT([xmlsec1],[1.2.28],[http://www.aleksey.com/xmlsec]) XMLSEC_PACKAGE=xmlsec1 XMLSEC_VERSION_MAJOR=1 XMLSEC_VERSION_MINOR=2 -XMLSEC_VERSION_SUBMINOR=22 +XMLSEC_VERSION_SUBMINOR=28 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR" XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'` XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'` AC_PREREQ([2.52g]) +AC_LANG(C) AC_CANONICAL_HOST AC_SUBST(XMLSEC_VERSION) @@ -21,7 +22,7 @@ AC_SUBST(XMLSEC_VERSION_SUBMINOR) AC_SUBST(XMLSEC_VERSION_INFO) AC_CONFIG_MACRO_DIR(m4) -AM_INIT_AUTOMAKE([1.7 tar-ustar subdir-objects -Wno-portability]) +AM_INIT_AUTOMAKE([1.7 tar-ustar subdir-objects -Wno-portability foreign]) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE @@ -43,7 +44,7 @@ LT_INIT dnl dnl Find programs dnl -if test "z$RM" == "z" ; then +if test "z$RM" = "z" ; then AC_PATH_PROG(RM, rm, /bin/rm) fi AC_PATH_PROG(CP, cp, /bin/cp) @@ -51,6 +52,16 @@ AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) AC_PATH_PROG(PERL, perl) +dnl Programs for man pahes and html docs +AC_PATH_PROG(HELP2MAN, help2man) +AC_PATH_PROG(XSLTPROC, xsltproc) +AC_PATH_PROG(MAN2HTML, man2html) +AC_PATH_PROG(GTKDOC_MKHTML, gtkdoc-mkhtml) +AC_PATH_PROG(GTKDOC_MKDB, gtkdoc-mkdb) +AC_PATH_PROG(GTKDOC_SCAN, gtkdoc-scan) +AM_CONDITIONAL(HAS_HELP2MAN, [test x"$HELP2MAN" != x]) +AM_CONDITIONAL(HAS_MAN2HTML, [test x"$MAN2HTML" != x]) +AM_CONDITIONAL(HAS_XSLTPROC, [test x"$XSLTPROC" != x]) dnl Checks for header files. AC_HEADER_DIRENT @@ -67,67 +78,65 @@ AC_CHECK_FUNCS(strchr strrchr printf sprintf fprintf snprintf vfprintf vsprintf XMLSEC_DEFINES="" dnl ========================================================================== -dnl Specific setup for Aleksey's development environment: +dnl Detect windows +dnl ========================================================================== +build_windows=no +case "${host_os}" in + cygwin*|mingw*) + build_windows=yes + ;; +esac + +dnl ========================================================================== +dnl Specific setup for Aleksey's development environment: dnl - with debug dnl - with pedantic compiler flags dnl - with docs build dnl - with static binaries dnl - without dynamic xmlsec-crypto loading dnl ========================================================================== -AC_MSG_CHECKING(for development environment) -AC_ARG_ENABLE(development, [ --enable-development enable development environment (no)]) +AC_MSG_CHECKING(for development environment) +AC_ARG_ENABLE([development], [AC_HELP_STRING([--enable-development], [enable development environment (no)])]) if test "z$enable_development" = "zyes" ; then enable_debugging="yes" enable_pedantic="yes" enable_static_linking="yes" - enable_manpages_build="yes" - enable_docs_build="yes" + enable_manpages_build="no" + enable_docs_build="no" enable_crypto_dl="no" - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) fi dnl ========================================================================== dnl Do we want to build manpages? dnl ========================================================================== -AC_MSG_CHECKING(for man pages build) -AC_ARG_ENABLE(manpages_build,[ --enable-manpages-build man pages build (no)]) +AC_MSG_CHECKING(for man pages build) +AC_ARG_ENABLE([manpages_build], [AC_HELP_STRING([--enable-manpages-build], [man pages build (no)])]) if test "z$enable_manpages_build" = "zyes" ; then - AC_PATH_PROG(HELP2MAN, help2man) - - AC_MSG_RESULT(yes) + AM_CONDITIONAL(BUILD_MANPAGES, [test x"$HELP2MAN" != x]) + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) + AM_CONDITIONAL(BUILD_MANPAGES, [test "x" = "y"]) + AC_MSG_RESULT([disabled]) fi -AM_CONDITIONAL(HAS_HELP2MAN, [test x"$HELP2MAN" != x]) -AM_CONDITIONAL(BUILD_MANPAGES, [test x"$HELP2MAN" != x]) - dnl ========================================================================== dnl Do we want to build docs? dnl ========================================================================== -AC_MSG_CHECKING(for docs build) -AC_ARG_ENABLE(docs_build, [ --enable-docs-build docs build (no)]) +AC_MSG_CHECKING(for docs build) +AC_ARG_ENABLE([docs_build], [AC_HELP_STRING([--enable-docs-build], [docs build (no)])]) if test "z$enable_docs_build" = "zyes" ; then - AC_PATH_PROG(XSLTPROC, xsltproc) - AC_PATH_PROG(MAN2HTML, man2html) - AC_PATH_PROG(GTKDOC_MKHTML, gtkdoc-mkhtml) - AC_PATH_PROG(GTKDOC_MKTMPL, gtkdoc-mktmpl) - AC_PATH_PROG(GTKDOC_MKDB, gtkdoc-mkdb) - AC_PATH_PROG(GTKDOC_SCAN, gtkdoc-scan) - - AC_MSG_RESULT(yes) + AM_CONDITIONAL(BUILD_MAN_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$MAN2HTML" != x]) + AM_CONDITIONAL(BUILD_API_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$GTKDOC_MKHTML" != x && test x"$GTKDOC_MKDB" != x && test x"$GTKDOC_SCAN" != x]) + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) + AM_CONDITIONAL(BUILD_MAN_DOCS, [test "x" = "y"]) + AM_CONDITIONAL(BUILD_API_DOCS, [test "x" = "y"]) + AC_MSG_RESULT([disabled]) fi -AM_CONDITIONAL(HAS_MAN2HTML, [test x"$MAN2HTML" != x]) -AM_CONDITIONAL(HAS_XSLTPROC, [test x"$XSLTPROC" != x]) - -AM_CONDITIONAL(BUILD_MAN_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$MAN2HTML" != x]) -AM_CONDITIONAL(BUILD_API_DOCS, [test x"$PERL" != x && test x"$XSLTPROC" != x && test x"$GTKDOC_MKHTML" != x && test x"$GTKDOC_MKTMPL" != x && test x"$GTKDOC_MKDB" != x && test x"$GTKDOC_SCAN" != x]) - dnl ========================================================================== dnl Perform host specific configuration dnl ========================================================================== @@ -135,8 +144,6 @@ XMLSEC_EXTRA_LDFLAGS= XMLSEC_CRYPTO_EXTRA_LDFLAGS= dnl should separate extra LDFLAGS for xmlsec and crypto libs ? dnl should --enable-runtime-pseudo-reloc for mingw and cygwin ? - -xmlsec_sharedlib_hack="no" if test -n "$shrext"; then XMLSEC_SHLIBSFX="$shrext" else @@ -154,28 +161,24 @@ case "${host}" in XMLSEC_EXTRA_LDFLAGS="-no-undefined -avoid-version" XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined -avoid-version" XMLSEC_SHLIBSFX=".dll.a" - xmlsec_sharedlib_hack="yes" ;; *-*-cygwin*) XMLSEC_EXTRA_LDFLAGS="-no-undefined" XMLSEC_CRYPTO_EXTRA_LDFLAGS="-no-undefined" ;; *-*-darwin*) - XMLSEC_SHLIBSFX=".dylib" - ;; + XMLSEC_SHLIBSFX=".dylib" + ;; esac -# To avoid problem with loading of a shared library (dlopen or equivalent) -# at run time on some platforms we need to link crypto modules with extra -# source. It's work without hack on 9x and under emulation. -# On nt 5.x (w2k,xp) the error is 998("Invalid access to memory location"). -AM_CONDITIONAL(SHAREDLIB_HACK, [test "z$xmlsec_sharedlib_hack" = "zyes"]) - dnl ========================================================================== dnl Hack for autoconf version mismatch dnl ========================================================================== -if test "z$shrext" == "z" ; then - shrext=$shrext_cmds +if test "z$shrext" = "z" ; then + AC_MSG_CHECKING(for shared library suffix) + module=no + eval shrext=$shrext_cmds + AC_MSG_RESULT($shrext) fi dnl ========================================================================== @@ -190,19 +193,19 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[char *foo = __func__;]])], [ac_func_exists=yes], [ac_func_exists=no]) -if test "z$ac_func_exists" = "zyes" ; then - AC_MSG_RESULT(__func__) +if test "z$ac_func_exists" = "zyes" ; then + AC_MSG_RESULT([__func__]) XMLSEC_DEFINES="$XMLSEC_DEFINES -D__XMLSEC_FUNCTION__=__func__" elif test "z$ac_function_exists" = "zyes" ; then - AC_MSG_RESULT(__FUNCTION__) + AC_MSG_RESULT([__FUNCTION__]) XMLSEC_DEFINES="$XMLSEC_DEFINES -D__XMLSEC_FUNCTION__=__FUNCTION__" -else - AC_MSG_RESULT("no") +else + AC_MSG_RESULT("no") fi dnl ========================================================================== -dnl check do we have size_t and its size, -dnl TODO: will need to replace this and the xmlSecSize define with +dnl check do we have size_t and its size, +dnl TODO: will need to replace this and the xmlSecSize define with dnl typedef on next ABI refresh dnl ========================================================================== AC_CHECK_SIZEOF(size_t) @@ -211,83 +214,232 @@ if test "$ac_cv_sizeof_size_t" -ne "4" ; then fi dnl ========================================================================== -dnl Check if pkg-config enabled and installed +dnl Check if pkg-config is enabled and installed dnl ========================================================================== -PKG_CONFIG="pkg-config" PKGCONFIG_FOUND="no" -AC_ARG_ENABLE(pkgconfig, [ --enable-pkgconfig enable pkgconfig for configuration (yes)]) +AC_ARG_ENABLE([pkgconfig], [AC_HELP_STRING([--enable-pkgconfig], [enable pkgconfig for configuration (yes)])]) if test "z$enable_pkgconfig" != "zno" ; then - AC_CHECK_PROG(PKGCONFIG_PRESENT, $PKG_CONFIG, yes, no) - if test "z$PKGCONFIG_PRESENT" = "zyes" ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.9 ; then - PKGCONFIG_FOUND="yes" - fi - fi + PKG_PROG_PKG_CONFIG + PKGCONFIG_FOUND="yes" +else + PKGCONFIG_FOUND="no" fi +dnl ========================================================================== +dnl Check if packages custom config scripts are enabled +dnl ========================================================================== +ENABLE_CUSTOM_CONFIGS="no" +AC_ARG_ENABLE([custom-configs], [AC_HELP_STRING([--enable-custom-configs], [enable package-specific custom scripts for configuration (yes)])]) +if test "z$enable_custom_configs" != "zno" ; then + ENABLE_CUSTOM_CONFIGS="yes" +else + ENABLE_CUSTOM_CONFIGS="no" +fi + +dnl ========================================================================== +dnl Check searching for typical packages folders is enabled +dnl ========================================================================== +ENABLE_FOLDERS_SEARCH="no" +AC_ARG_ENABLE([folders-search], [AC_HELP_STRING([--enable-folders-search], [enable searching for package installation in typical folders (yes)])]) +if test "z$enable_folders_search" != "zno" ; then + ENABLE_FOLDERS_SEARCH="yes" +else + ENABLE_FOLDERS_SEARCH="no" +fi + +dnl ========================================================================== +dnl Common installation locations +dnl ========================================================================== +COMMON_INCLUDE_DIR="/usr/include /usr/local/include" +COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib" +case $host in + i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;; + x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;; + *) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/$host" ;; +esac + +dnl Macro to help find the folder that contains marker file. +dnl Usage: AX_FIND_FOLDER(RESULT_VARIABLE, MARKER_FILE, FOLDERS_LIST) +AC_DEFUN([AX_FIND_FOLDER],[ + for dir in $3 ; do + if test -f "$dir/$2" ; then + $1="$dir" + break; + fi + done +]) + dnl ========================================================================== dnl find libxml dnl ========================================================================== -LIBXML_MIN_VERSION="2.7.4" +LIBXML_MIN_VERSION="2.8.0" +LIBXML_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/include/libxml2 /usr/local/include/libxml2 /usr/local/libxml2/include" +LIBXML_LIB_DIR="$COMMON_LIB_DIR /usr/local/libxml2/lib" +LIBXML_INCLUDE_MARKER="libxml/xmlversion.h" +LIBXML_SHARED_LIB_MARKER="libxml2$shrext" +LIBXML_STATIC_LIB_MARKER="libxml2.$libext" +LIBXML_LIBS_LIST="-lxml2" LIBXML_CONFIG="xml2-config" -LIBXML_CFLAGS="" -LIBXML_LIBS="" + +LIBXML_INCLUDE_PATH= +LIBXML_LIB_PATH= +LIBXML_CONFIG_PATH= LIBXML_FOUND="no" -AC_ARG_WITH(libxml, - [ --with-libxml=[PFX] libxml2 location] -) -AC_ARG_WITH(libxml-src, - [ --with-libxml-src=[PFX] not installed yet libxml2 location] -) - -if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then - AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION) - AC_MSG_ERROR(libxml2 >= $LIBXML_MIN_VERSION is required for $XMLSEC_PACKAGE) -elif test "z$with_libxml_src" != "z" ; then - AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION) - CWD=`pwd` - if cd "$with_libxml_src" ; then - SRC_DIR=`pwd` - LIBXML_CONFIG=${SRC_DIR}/xml2-config - LIBXML_LIBS="-L${SRC_DIR}/.libs -lxml2" - LIBXML_CFLAGS="-I${SRC_DIR}/include" - LIBXML_FOUND="yes" - cd $CWD - AC_MSG_RESULT([yes (source)]) - else - AC_MSG_ERROR([libxml source dir not found (${with_libxml_src}), typo?]) - fi -elif test "z$with_libxml" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then +AC_ARG_WITH([libxml], [AC_HELP_STRING([--with-libxml@<:@=PFX@:>@], [libxml2 location])]) +AC_ARG_WITH([libxml-src], [AC_HELP_STRING([--with-libxml-src@<:@=PFX@:>@], [libxml2 source tree location])]) + +dnl Priority 0: LibXML2 is disabled: hard error. +if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then + LIBXML_FOUND="disabled" +fi + +dnl Priority 1: User specifies the path to source code +if test "z$LIBXML_FOUND" = "zno" -a "z$with_libxml_src" != "z" -a "z$with_libxml_src" != "zyes" ; then + AC_MSG_CHECKING(for libxml2 library source tree in "$with_libxml_src" folder) + if test [ -f "$with_libxml_src/include/$LIBXML_INCLUDE_MARKER" ] -a [ -f "$with_libxml_src/.libs/$LIBXML_SHARED_LIB_MARKER" -o -f "$with_libxml_src/.libs/$LIBXML_STATIC_LIB_MARKER"] ; then + LIBXML_INCLUDE_PATH="$with_libxml_src/include" + LIBXML_LIB_PATH="$with_libxml_src/.libs" + LIBXML_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_libxml_src/include/$LIBXML_INCLUDE_MARKER" or "$with_libxml_src/.libs/$LIBXML_SHARED_LIB_MARKER" or "$with_libxml_src/.libs/$LIBXML_STATIC_LIB_MARKER" files don't exist), typo?]) + fi +fi + +dnl Priority 2: User specifies path to installation +if test "z$LIBXML_FOUND" = "zno" -a "z$with_libxml" != "z" -a "z$with_libxml" != "zyes" ; then + AC_MSG_CHECKING(for libxml2 library installation in "$with_libxml" folder) + if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_libxml/bin/$LIBXML_CONFIG" ; then + LIBXML_CONFIG_PATH="$with_libxml/bin/$LIBXML_CONFIG" + LIBXML_FOUND="yes" + AC_MSG_RESULT([yes]) + elif test [ -f "$with_libxml/include/libxml2/$LIBXML_INCLUDE_MARKER" ] -a [ -f "$with_libxml/lib/$LIBXML_SHARED_LIB_MARKER" -o -f "$with_libxml/lib/$LIBXML_STATIC_LIB_MARKER" ] ; then + LIBXML_INCLUDE_PATH="$with_libxml/include/libxml2" + LIBXSLT_LIB_PATH="$with_libxml/lib" + LIBXML_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_libxml/bin/$LIBXML_CONFIG" tool, or "$with_libxml/include/libxml2/$LIBXML_INCLUDE_MARKER" and/or "$with_libxml/lib/$LIBXML_SHARED_LIB_MARKER" or "$with_libxml/lib/$LIBXML_STATIC_LIB_MARKER" files don't exist), typo?]) + fi +fi + +dnl Priority 3: User sets both CFLAGS and LIBS flags +if test "z$LIBXML_FOUND" = "zno" -a "z$LIBXML_CFLAGS" != "z" -a "z$LIBXML_LIBS" != "z" ; then + LIBXML_FOUND="yes" +fi + +dnl Priority 4: Guess with pkg_config +if test "z$LIBXML_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_MIN_VERSION, - [LIBXML_FOUND=yes], - [LIBXML_FOUND=no]) + [LIBXML_FOUND=yes], + [LIBXML_FOUND=no]) +fi + +dnl Priority 5: Guess the config tool location +if test "z$LIBXML_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then + AC_PATH_PROG(LIBXML_CONFIG_PATH, [$LIBXML_CONFIG], [], [$PATH]) + if test "z$LIBXML_CONFIG_PATH" != "z" ; then + LIBXML_FOUND="yes" + fi +fi + +dnl Priority 6: Guess using a list of folders. +if test "z$LIBXML_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then + AC_MSG_CHECKING(for libxml2 library installation in the typical folders) + if test "z$LIBXML_INCLUDE_PATH" = "z" ; then + AX_FIND_FOLDER(LIBXML_INCLUDE_PATH, $LIBXML_INCLUDE_MARKER, $LIBXML_INCLUDE_DIR) + fi + if test "z$LIBXML_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(LIBXML_LIB_PATH, $LIBXML_SHARED_LIB_MARKER, $LIBXML_LIB_DIR) + fi + if test "z$LIBXML_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(LIBXML_LIB_PATH, $LIBXML_STATIC_LIB_MARKER, $LIBXML_LIB_DIR) + fi + if test "z$LIBXML_INCLUDE_PATH" != "z" -a "z$LIBXML_LIB_PATH" != "z" ; then + LIBXML_FOUND="yes" + AC_MSG_RESULT([yes ("-I$LIBXML_INCLUDE_PATH -L$LIBXML_LIB_PATH")]) + else + AC_MSG_RESULT([not found]) + fi fi + +dnl Priority 7: Just try to compile/link and hope for the best if test "z$LIBXML_FOUND" = "zno" ; then - if test "z$with_libxml" != "zyes" ; then - if test "z$with_libxml" != "z" ; then - AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [], - [$with_libxml/bin:$PATH]) - else - AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [], - [$PATH]) - fi - fi - AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ]) - if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then - AC_MSG_ERROR(Could not find libxml2 anywhere.) - fi - vers=`echo $LIBXML_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge "$minvers" ; then - LIBXML_LIBS="`$LIBXML_CONFIG --libs`" - LIBXML_CFLAGS="`$LIBXML_CONFIG --cflags`" - LIBXML_FOUND="yes" - AC_MSG_RESULT([yes ('$LIBXML_VERSION')]) + AC_MSG_CHECKING(for libxml2 library installation) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $LIBXML_LIBS $LIBXML_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + ]],[[ + int main () { xmlCheckVersion(0);; return(0); } + ]]) + ],[ + LIBXML_FOUND=yes + LIBXML_LIBS="$LIBXML_LIBS $LIBXML_LIBS_LIST" + AC_MSG_RESULT([yes]) + ],[ + LIBXML_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi + +dnl Set CFLAGS/LIBS flags +if test "z$LIBXML_FOUND" = "zyes" ; then + if test "z$LIBXML_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then + dnl Get the values using config tool (overwrite CFLAGS/LIBS!) + if test "z$LIBXML_CFLAGS" = "z" ; then + LIBXML_CFLAGS="`$LIBXML_CONFIG_PATH --cflags`" + fi + if test "z$LIBXML_LIBS" = "z"; then + LIBXML_LIBS="`$LIBXML_CONFIG_PATH --libs`" + fi + LIBXML_CONFIG=$LIBXML_CONFIG_PATH + LIBXML_FOUND="yes" else - AC_MSG_ERROR(You need at least libxml2 $LIBXML_MIN_VERSION for this version of $XMLSEC_PACKAGE) + dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!) + if test "z$LIBXML_INCLUDE_PATH" != "z" ; then + LIBXML_CFLAGS="$LIBXML_CFLAGS -I$LIBXML_INCLUDE_PATH" + fi + if test "z$LIBXML_LIB_PATH" != "z" ; then + if test "z$with_gnu_ld" = "zyes" ; then + LIBXML_LIBS="$LIBXML_LIBS -Wl,-rpath-link -Wl,$LIBXML_LIB_PATH" + fi + LIBXML_LIBS="$LIBXML_LIBS -L$LIBXML_LIB_PATH $LIBXML_LIBS_LIST" + fi fi fi +dnl Verify the version. +AC_MSG_CHECKING(for libxml2 library >= $LIBXML_MIN_VERSION) +if test "z$LIBXML_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS" + minvers=`echo $LIBXML_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'` + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if LIBXML_VERSION >= $minvers + greater-than-minvers + #endif + ],[ + LIBXML_FOUND=yes + ],[ + LIBXML_FOUND=no + ]) + CPPFLAGS=$OLD_CPPFLAGS +fi +AC_MSG_RESULT([$LIBXML_FOUND]) + +dnl LibXML2 is required so if we didn't find it then it is a fatal error. +if test "z$LIBXML_FOUND" != "zyes" ; then + AC_MSG_ERROR([libxml2 library >= $LIBXML_MIN_VERSION is required for this version of $XMLSEC_PACKAGE]) +fi + +dnl Finally set variables AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) AC_SUBST(LIBXML_CONFIG) @@ -296,82 +448,178 @@ AC_SUBST(LIBXML_MIN_VERSION) dnl ========================================================================== dnl find libxslt dnl ========================================================================== -XMLSEC_NO_LIBXSLT="1" LIBXSLT_MIN_VERSION=1.0.20 -LIBXSLT_PC_FILE_COND="libxslt >= $LIBXSLT_MIN_VERSION" +LIBXSLT_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/libxslt/include" +LIBXSLT_LIB_DIR="$COMMON_LIB_DIR /usr/local/libxslt/lib" LIBXSLT_CONFIG="xslt-config" -LIBXSLT_CFLAGS="" -LIBXSLT_LIBS="" +LIBXSLT_INCLUDE_MARKER="libxslt/xsltconfig.h" +LIBXSLT_SHARED_LIB_MARKER="libxslt$shrext" +LIBXSLT_STATIC_LIB_MARKER="libxslt.$libext" +LIBXSLT_LIBS_LIST="-lxslt" + +XMLSEC_NO_LIBXSLT="1" +LIBXSLT_INCLUDE_PATH= +LIBXSLT_LIB_PATH= +LIBXSLT_CONFIG_PATH= LIBXSLT_FOUND="no" -AC_ARG_WITH(libxslt, - [ --with-libxslt=[PFX] libxslt location] -) -AC_ARG_WITH(libxslt-src, - [ --with-libxslt-src=[PFX] not installed yet libxslt location] -) +AC_ARG_WITH([libxslt], [AC_HELP_STRING([--with-libxslt@<:@=PFX@:>@], [libxslt location])]) +AC_ARG_WITH([libxslt-src], [AC_HELP_STRING([--with-libxslt-src@<:@=PFX@:>@],[libxslt source tree location])]) + +dnl Priority 0: Check if library is not needed if test "z$with_libxslt" = "zno" -o "z$with_libxslt_src" = "zno" ; then - AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) - AC_MSG_RESULT(no) - LIBXSLT_FOUND="without" -elif test "z$with_libxslt_src" != "z" ; then - AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) - CWD=`pwd` - if cd "$with_libxslt_src" ; then - SRC_DIR=`pwd` - LIBXSLT_CONFIG=${SRC_DIR}/xslt-config - LIBXSLT_LIBS="-L${SRC_DIR}/libxslt/.libs -lxslt" - LIBXSLT_CFLAGS="-I${SRC_DIR}" - LIBXSLT_FOUND="yes" - cd $CWD - AC_MSG_RESULT([yes (source)]) - else - AC_MSG_ERROR([libxslt source dir not found (${with_libxslt_src}), typo?]) - fi -elif test "z$with_libxslt" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then + LIBXSLT_FOUND="disabled" +fi + +dnl Priority 1: User specifies the path to source code +if test "z$LIBXSLT_FOUND" = "zno" -a "z$with_libxslt_src" != "z" -a "z$with_libxslt_src" != "zyes" ; then + AC_MSG_CHECKING(for libxslt library source tree in "$with_libxslt_src" folder) + if test [ -f "$with_libxslt_src/$LIBXSLT_INCLUDE_MARKER" ] -a [ -f "$with_libxslt_src/libxslt/.libs/$LIBXSLT_SHARED_LIB_MARKER" -o -f "$with_libxslt_src/libxslt/.libs/$LIBXSLT_STATIC_LIB_MARKER" ] ; then + LIBXSLT_INCLUDE_PATH="$with_libxslt_src" + LIBXSLT_LIB_PATH="$with_libxslt_src/libxslt/.libs" + LIBXSLT_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_libxslt_src/$LIBXSLT_INCLUDE_MARKER" and/or "$with_libxslt_src/libxslt/.libs/$LIBXSLT_SHARED_LIB_MARKER" or "$with_libxslt_src/libxslt/.libs/$LIBXSLT_STATIC_LIB_MARKER" files don't exist), typo?]) + fi +fi + +dnl Priority 2: User specifies path to installation +if test "z$LIBXSLT_FOUND" = "zno" -a "z$with_libxslt" != "z" -a "z$with_libxslt" != "zyes" ; then + AC_MSG_CHECKING(for libxslt library installation in "$with_libxslt" folder) + if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_libxslt/bin/$LIBXSLT_CONFIG" ; then + LIBXSLT_CONFIG_PATH="$with_libxslt/bin/$LIBXSLT_CONFIG" + LIBXSLT_FOUND="yes" + AC_MSG_RESULT([yes]) + elif test [ -f "$with_libxslt/include/$LIBXSLT_INCLUDE_MARKER" ] -a [ -f "$with_libxslt/lib/$LIBXSLT_SHARED_LIB_MARKER" -o -f "$with_libxslt/lib/$LIBXSLT_STATIC_LIB_MARKER" ] ; then + LIBXSLT_INCLUDE_PATH="$with_libxslt/include" + LIBXSLT_LIB_PATH="$with_libxslt/lib" + LIBXSLT_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_libxslt/bin/$LIBXSLT_CONFIG" tool, or "$with_libxslt/include/$LIBXSLT_INCLUDE_MARKER" and/or "$with_libxslt/lib/$LIBXSLT_SHARED_LIB_MARKER" or "$with_libxslt/lib/$LIBXSLT_STATIC_LIB_MARKER" files don't exist), typo?]) + fi +fi + +dnl Priority 3: User sets both CFLAGS and LIBS flags +if test "z$LIBXSLT_FOUND" = "zno" -a "z$LIBXSLT_CFLAGS" != "z" -a "z$LIBXSLT_LIBS" != "z" ; then + LIBXSLT_FOUND="yes" +fi + +dnl Priority 4: Guess with pkg_config +if test "z$LIBXSLT_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then PKG_CHECK_MODULES(LIBXSLT, libxslt >= $LIBXSLT_MIN_VERSION, - [LIBXSLT_FOUND=yes], - [LIBXSLT_FOUND=no]) + [LIBXSLT_FOUND=yes], + [LIBXSLT_FOUND=no]) +fi + +dnl Priority 5: Guess the config tool location +if test "z$LIBXSLT_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then + AC_PATH_PROG(LIBXSLT_CONFIG_PATH, [$LIBXSLT_CONFIG], [], [$PATH]) + if test "z$LIBXSLT_CONFIG_PATH" != "z" ; then + LIBXSLT_FOUND="yes" + fi +fi + +dnl Priority 6: Guess using a list of folders. +if test "z$LIBXSLT_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then + AC_MSG_CHECKING(for libxslt library installation in the typical folders) + if test "z$LIBXSLT_INCLUDE_PATH" = "z" ; then + AX_FIND_FOLDER(LIBXSLT_INCLUDE_PATH, $LIBXSLT_INCLUDE_MARKER, $LIBXSLT_INCLUDE_DIR) + fi + if test "z$LIBXSLT_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(LIBXSLT_LIB_PATH, $LIBXSLT_SHARED_LIB_MARKER, $LIBXSLT_LIB_DIR) + fi + if test "z$LIBXSLT_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(LIBXSLT_LIB_PATH, $LIBXSLT_STATIC_LIB_MARKER, $LIBXSLT_LIB_DIR) + fi + if test "z$LIBXSLT_INCLUDE_PATH" != "z" -a "z$LIBXSLT_LIB_PATH" != "z" ; then + LIBXSLT_FOUND="yes" + AC_MSG_RESULT([yes ("-I$LIBXSLT_INCLUDE_PATH -L$LIBXSLT_LIB_PATH")]) + else + AC_MSG_RESULT([not found]) + fi fi +dnl Priority 7: Just try to compile/link and hope for the best if test "z$LIBXSLT_FOUND" = "zno" ; then - if test "z$with_libxslt" != "zyes" ; then - if test "z$with_libxslt" != "z" ; then - AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [], - [$with_libxslt/bin:$PATH]) - else - AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [], - [$PATH]) + AC_MSG_CHECKING(for libxslt library installation) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $LIBXML_LIBS $LIBXSLT_LIBS $LIBXSLT_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + ]],[[ + int main () { xsltInit(); return(0); } + ]]) + ],[ + LIBXSLT_FOUND=yes + LIBXSLT_LIBS="$LIBXSLT_LIBS $LIBXSLT_LIBS_LIST" + AC_MSG_RESULT([yes]) + ],[ + LIBXSLT_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi + +dnl Set CFLAGS/LIBS flags +if test "z$LIBXSLT_FOUND" = "zyes" ; then + if test "z$LIBXSLT_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then + dnl Get the values using config tool (overwrite CFLAGS/LIBS!) + if test "z$LIBXSLT_CFLAGS" = "z" ; then + LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG_PATH --cflags`" fi - fi - AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) - if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then - if test "z$with_libxslt" != "zyes" ; then - AC_MSG_ERROR(Unable to find libxslt at '$with_libxslt') - else - AC_MSG_RESULT(no) - fi + if test "z$LIBXSLT_LIBS" = "z"; then + LIBXSLT_LIBS="`$LIBXSLT_CONFIG_PATH --libs`" + fi + LIBXSLT_CONFIG=$LIBXSLT_CONFIG_PATH + LIBXSLT_FOUND="yes" else - vers=`echo $LIBXSLT_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge "$minvers" ; then - LIBXSLT_LIBS="`$LIBXSLT_CONFIG --libs`" - LIBXSLT_CFLAGS="`$LIBXSLT_CONFIG --cflags`" - LIBXSLT_FOUND="yes" - AC_MSG_RESULT([yes ('$LIBXSLT_VERSION')]) - else - AC_MSG_ERROR(You need at least libxslt $LIBXSLT_MIN_VERSION for this version of $XMLSEC_PACKAGE) - fi + dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!) + if test "z$LIBXSLT_INCLUDE_PATH" != "z" ; then + LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -I$LIBXSLT_INCLUDE_PATH" + fi + if test "z$LIBXSLT_LIB_PATH" != "z" ; then + if test "z$with_gnu_ld" = "zyes" ; then + LIBXSLT_LIBS="$LIBXSLT_LIBS -Wl,-rpath-link -Wl,$LIBXSLT_LIB_PATH" + fi + LIBXSLT_LIBS="$LIBXSLT_LIBS -L$LIBXSLT_LIB_PATH $LIBXSLT_LIBS_LIST" + fi fi fi +dnl Verify the version +AC_MSG_CHECKING(for libxslt library >= $LIBXSLT_MIN_VERSION) +if test "z$LIBXSLT_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBXSLT_CFLAGS" + minvers=`echo $LIBXSLT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'` + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if LIBXSLT_VERSION >= $minvers + greater-than-minvers + #endif + ],[ + LIBXSLT_FOUND=yes + ],[ + LIBXSLT_FOUND=no + ]) + CPPFLAGS=$OLD_CPPFLAGS +fi +AC_MSG_RESULT([$LIBXSLT_FOUND]) + +dnl Finally set variables if test "z$LIBXSLT_FOUND" = "zyes" ; then XMLSEC_NO_LIBXSLT="0" + LIBXSLT_PC_FILE_COND="libxslt >= $LIBXSLT_MIN_VERSION" else + XMLSEC_NO_LIBXSLT="1" LIBXSLT_PC_FILE_COND="" - LIBXSLT_MIN_VERSION="" XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XSLT=1" fi - AC_SUBST(XMLSEC_NO_LIBXSLT) AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_LIBS) @@ -388,192 +636,231 @@ XMLSEC_CRYPTO_DISABLED_LIST="" dnl ========================================================================== dnl OpenSSL dnl ========================================================================== -ac_openssl_lib_dir="/usr/local/lib /usr/lib /usr/lib64 /usr/local /usr/local/ssl /usr/local/ssl/lib /usr/pkg" -ac_openssl_inc_dir="/usr/local/include /usr/include /usr/local /usr/local/ssl /usr/pkg /usr/local/ssl/include" +OPENSSL_MIN_VERSION="1.0.0" +OPENSSL_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/ssl/include" +OPENSSL_LIB_DIR="$COMMON_LIB_DIR /usr/local/ssl/lib" +OPENSSL_CRYPTO_LIB="$XMLSEC_PACKAGE-openssl" +OPENSSL_INCLUDE_MARKER="openssl/opensslv.h" +OPENSSL_LIB_SHARED_MARKER="libcrypto$shrext" +OPENSSL_LIB_STATIC_MARKER="libcrypto.a" +OPENSSL_LIBS_LIST="-lcrypto" +case $host in + *-*-mingw*) OPENSSL_EXTRA_LIBS=;; + *-*-osf5*) OPENSSL_EXTRA_LIBS=;; + *-*-openbsd*) OPENSSL_EXTRA_LIBS=;; + *-*-netbsd*) OPENSSL_EXTRA_LIBS=;; + *-*-freebsd*|*-*-dragonfly*) OPENSSL_EXTRA_LIBS=;; + *-*-darwin*) OPENSSL_EXTRA_LIBS=;; + #FIXME: check if lib "dl" is required + *) OPENSSL_EXTRA_LIBS=-ldl;; +esac XMLSEC_NO_OPENSSL="1" -OPENSSL_MIN_VERSION="0.9.8" OPENSSL_VERSION="" -OPENSSL_CFLAGS="" -OPENSSL_LIBS="" -OPENSSL_CRYPTO_LIB="$XMLSEC_PACKAGE-openssl" +OPENSSL_INCLUDE_PATH= +OPENSSL_LIB_PATH= OPENSSL_FOUND=no -AC_ARG_WITH(openssl, [ --with-openssl=[PFX] openssl location]) +AC_ARG_WITH([openssl], [AC_HELP_STRING([--with-openssl@<:@=PFX@:>@], [openssl location])]) + +dnl Priority 0: Check if library is disabled if test "z$with_openssl" = "zno" ; then - OPENSSL_FOUND=without - AC_MSG_CHECKING(for openssl libraries >= $OPENSSL_MIN_VERSION) - AC_MSG_RESULT(no) -elif test "z$with_openssl" != "z" ; then - case $host in - *-*-mingw*) openssl_exlibs=;; - *-*-osf5*) openssl_exlibs=;; - *-*-openbsd*) openssl_exlibs=;; - *-*-netbsd*) openssl_exlibs=;; - #FIXME: check if lib "dl" is required - *) openssl_exlibs=-ldl;; - esac - OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include" - if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then - OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs" + OPENSSL_FOUND=disabled +fi + +dnl Priority 1: User specifies the path to installation +if test "z$OPENSSL_FOUND" = "zno" -a "z$with_openssl" != "z" -a "z$with_openssl" != "zyes" ; then + AC_MSG_CHECKING(for openssl library installation in "$with_openssl" folder) + if test -f "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" -a -f "$with_openssl/lib/$OPENSSL_LIB_SHARED_MARKER" ; then + OPENSSL_INCLUDE_PATH="$with_openssl/include" + OPENSSL_LIB_PATH="$with_openssl/lib" + OPENSSL_FOUND="yes" + AC_MSG_RESULT([yes]) + elif test -f "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" -a -f "$with_openssl/lib/$OPENSSL_LIB_STATIC_MARKER" ; then + OPENSSL_INCLUDE_PATH="$with_openssl/include" + OPENSSL_LIB_PATH="$with_openssl/lib" + OPENSSL_FOUND="yes" + AC_MSG_RESULT([yes]) else - OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs" + AC_MSG_ERROR([not found: "$with_openssl/include/$OPENSSL_INCLUDE_MARKER" or "$with_openssl/lib/$OPENSSL_LIB_SHARED_MARKER" or "$with_openssl/lib/$OPENSSL_LIB_STATIC_MARKER" files don't exist), typo?]) fi +fi + +dnl Priority 2: User sets both CFLAGS and LIBS flags +if test "z$OPENSSL_FOUND" = "zno" -a "z$OPENSSL_CFLAGS" != "z" -a "z$OPENSSL_LIBS" != "z" ; then OPENSSL_FOUND="yes" -elif test "z$PKGCONFIG_FOUND" = "zyes" ; then - if test "z$OPENSSL_VERSION" = "z" ; then - PKG_CHECK_MODULES(OPENSSL, openssl >= 1.1.0, - [OPENSSL_VERSION="1.1.0"], - [OPENSSL_VERSION=""]) - fi +fi - if test "z$OPENSSL_VERSION" = "z" ; then - PKG_CHECK_MODULES(OPENSSL, openssl >= 1.0.0, - [OPENSSL_VERSION="1.0.0"], - [OPENSSL_VERSION=""]) - fi +dnl Priority 3: Guess with pkg_config +if test "z$OPENSSL_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then + PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_MIN_VERSION, + [OPENSSL_FOUND=yes], + [OPENSSL_FOUND=no]) +fi - if test "z$OPENSSL_VERSION" = "z" ; then - PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.8, - [OPENSSL_VERSION="0.9.8"], - [OPENSSL_VERSION=""]) +dnl Priority 4: Guess using a list of folders (do not overwrite CFLAGS/LIBS flags). +if test "z$OPENSSL_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then + AC_MSG_CHECKING(for openssl library installation in the typical folders) + if test "z$OPENSSL_INCLUDE_PATH" = "z" ; then + AX_FIND_FOLDER(OPENSSL_INCLUDE_PATH, $OPENSSL_INCLUDE_MARKER, $OPENSSL_INCLUDE_DIR) fi - - if test "z$OPENSSL_VERSION" = "z" ; then - PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_MIN_VERSION, - [OPENSSL_VERSION="$OPENSSL_MIN_VERSION"], - [OPENSSL_VERSION=""]) + if test "z$OPENSSL_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(OPENSSL_LIB_PATH, $OPENSSL_LIB_SHARED_MARKER, $OPENSSL_LIB_DIR) fi - - if test "z$OPENSSL_VERSION" != "z" ; then + if test "z$OPENSSL_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(OPENSSL_LIB_PATH, $OPENSSL_LIB_STATIC_MARKER, $OPENSSL_LIB_DIR) + fi + if test "z$OPENSSL_INCLUDE_PATH" != "z" -a "z$OPENSSL_LIB_PATH" != "z" ; then OPENSSL_FOUND="yes" + AC_MSG_RESULT([yes ("-I$OPENSSL_INCLUDE_PATH -L$OPENSSL_LIB_PATH")]) + else + AC_MSG_RESULT([not found]) fi fi +dnl Priority 5: Just try to compile/link and hope for the best if test "z$OPENSSL_FOUND" = "zno" ; then - OPENSSL_INCLUDES_FOUND="no" - OPENSSL_LIBS_FOUND="no" - - for dir in $ac_openssl_inc_dir ; do - if test -f $dir/openssl/ssl.h ; then - dnl do not add -I/usr/include because compiler does it anyway - if test "z$dir" = "z/usr/include" ; then - OPENSSL_CFLAGS="$OPENSSL_CFLAGS " - else - OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$dir" - fi - OPENSSL_INCLUDES_FOUND="yes" - break - fi - done + AC_MSG_CHECKING(for openssl library installation) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $OPENSSL_LIBS $OPENSSL_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + ]],[[ + int main () { + #if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_library_init(); + #else + OPENSSL_init_ssl(0, NULL); + #endif + return(0); + } + ]]) + ],[ + OPENSSL_FOUND=yes + OPENSSL_LIBS="$OPENSSL_LIBS $OPENSSL_LIBS_LIST" + AC_MSG_RESULT([yes]) + ],[ + OPENSSL_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi - for dir in $ac_openssl_lib_dir ; do - if test -f $dir/libcrypto.a ; then - dnl do not add -L/usr/lib because compiler does it anyway - if test "z$dir" = "z/usr/lib" ; then - OPENSSL_LIBS="-lcrypto -ldl" - else - OPENSSL_LIBS="-L$dir -lcrypto -ldl" - fi - OPENSSL_LIBS_FOUND="yes" - ac_found_openssl_lib_dir=$dir - break; - fi - done - - if test "z$OPENSSL_INCLUDES_FOUND" = "zyes" -a "z$OPENSSL_LIBS_FOUND" = "zyes" ; then - OPENSSL_FOUND="yes" +dnl Set flags if INCLUDE_PATH or LIB_PATH are set +if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_INCLUDE_PATH" != "z" ; then + OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$OPENSSL_INCLUDE_PATH -I$OPENSSL_INCLUDE_PATH/openssl" +fi +if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_LIB_PATH" != "z" ; then + if test -f "$OPENSSL_LIB_PATH/$OPENSSL_LIB_SHARED_MARKER" ; then + if test "z$with_gnu_ld" = "zyes" ; then + OPENSSL_LIBS="$OPENSSL_LIBS -Wl,-rpath-link -Wl,$OPENSSL_LIB_PATH" + fi fi + OPENSSL_LIBS="$OPENSSL_LIBS -L$OPENSSL_LIB_PATH $OPENSSL_LIBS_LIST $OPENSSL_EXTRA_LIBS" fi -if test "z$OPENSSL_FOUND" = "zyes" -a "z$OPENSSL_VERSION" = "z" ; then - AC_MSG_CHECKING(for openssl libraries >= $OPENSSL_MIN_VERSION) - - dnl Check the OpenSSL version +dnl Check the OpenSSL version; if you change this code then you probably want to +dnl change include/xmlsec/openssl/crypto.h as well. +AC_MSG_CHECKING(for openssl library >= $OPENSSL_MIN_VERSION) +if test "z$OPENSSL_FOUND" = "zyes" ; then OLD_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$OPENSSL_CFLAGS" + CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS" + if test "z$OPENSSL_VERSION" = "z" ; then + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L + greater-than-minvers + #endif + ],[ + OPENSSL_VERSION="1.0.0 (LibreSSL < 2.7)" + ],[ + OPENSSL_VERSION="" + ]) + fi if test "z$OPENSSL_VERSION" = "z" ; then - AC_EGREP_CPP(yes,[ + AC_EGREP_CPP(greater-than-minvers, [ #include - #if OPENSSL_VERSION_NUMBER >= 0x10100000L - yes - #endif - ],[ - OPENSSL_VERSION="1.1.0" - ],[ - OPENSSL_VERSION="" - ]) + #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L + greater-than-minvers + #endif + ],[ + OPENSSL_VERSION="1.1.0 (LibreSSL >= 2.7)" + ],[ + OPENSSL_VERSION="" + ]) fi if test "z$OPENSSL_VERSION" = "z" ; then - AC_EGREP_CPP(yes,[ - #include - #if OPENSSL_VERSION_NUMBER >= 0x10000000L - yes - #endif - ],[ - OPENSSL_VERSION="1.0.0" - ],[ - OPENSSL_VERSION="" - ]) + AC_EGREP_CPP(greater-than-minvers, [ + #include + #include + #if OPENSSL_VERSION_NUMBER >= 0x10100000L + #ifdef OPENSSL_IS_BORINGSSL + greater-than-minvers + #endif + #endif + ],[ + OPENSSL_VERSION="1.1.0 (BoringSSL)" + enable_ripemd160=no + enable_dsa=no + ],[ + OPENSSL_VERSION="" + ]) fi if test "z$OPENSSL_VERSION" = "z" ; then - AC_EGREP_CPP(yes,[ - #include - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - yes - #endif - ],[ - OPENSSL_VERSION="0.9.8" - ],[ - OPENSSL_VERSION="" - ]) + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if OPENSSL_VERSION_NUMBER >= 0x10100000L + greater-than-minvers + #endif + ],[ + OPENSSL_VERSION="1.1.0" + ],[ + OPENSSL_VERSION="" + ]) fi if test "z$OPENSSL_VERSION" = "z" ; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT([yes ('$OPENSSL_VERSION')]) + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if OPENSSL_VERSION_NUMBER >= 0x10000000L + greater-than-minvers + #endif + ],[ + OPENSSL_VERSION="1.0.0" + ],[ + OPENSSL_VERSION="" + ]) fi - CPPFLAGS=$OLD_CPPFLAGS -fi + if test "z$OPENSSL_VERSION" != "z" ; then + OPENSSL_FOUND=yes + else + OPENSSL_FOUND=no + fi +fi if test "z$OPENSSL_FOUND" = "zyes" ; then - dnl Check availability of ECDSA - OLD_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$OPENSSL_CFLAGS" - - AC_EGREP_CPP(yes,[ - #include - #ifdef OPENSSL_NO_ECDSA - yes - #endif - ],[ - OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_NO_ECDSA=1" - ]) - CPPFLAGS=$OLD_CPPFLAGS + AC_MSG_RESULT([yes (openssl version '$OPENSSL_VERSION')]) +else + AC_MSG_RESULT([$OPENSSL_FOUND]) fi +dnl Finally set all the flags if test "z$OPENSSL_FOUND" = "zyes" ; then XMLSEC_NO_OPENSSL="0" - if test "z$OPENSSL_VERSION" = "z0.9.8" ; then - OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_OPENSSL_098=1 -DXMLSEC_NO_ECDSA=1 -DXMLSEC_NO_SHA256=1" - fi - if test "z$OPENSSL_VERSION" = "z1.0.0" ; then - OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_OPENSSL_100=1" - fi - if test "z$OPENSSL_VERSION" = "z1.1.0" ; then - OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_OPENSSL_110=1" - fi OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_CRYPTO_OPENSSL=1" XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST openssl" else XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl" fi -AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" == "z1") +AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" = "z1") AC_SUBST(XMLSEC_NO_OPENSSL) AC_SUBST(OPENSSL_CFLAGS) AC_SUBST(OPENSSL_LIBS) @@ -594,232 +881,291 @@ dnl AND / OR dnl dnl 2. separate NSS & NSPR distributions dnl options: [--with-nss=] [--with-nspr=] -dnl +dnl dnl 2 overrides 1 dnl dnl ========================================================================== -XMLSEC_NO_NSS="1" +NSS_MIN_VERSION="3.11.1" +NSPR_MIN_VERSION="4.4.1" SEAMONKEY_MIN_VERSION="1.0" MOZILLA_MIN_VERSION="1.4" -NSS_MIN_VERSION="3.9" -NSPR_MIN_VERSION="4.4.1" -NSS_CFLAGS="" -NSS_LIBS="" -NSS_LIBS_LIST="-lnss3 -lsmime3" -NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" -NSS_FOUND="no" NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss +NSPR_INCLUDE_MARKER="nspr/nspr.h" +NSPR_LIB_MARKER="libnspr4$shrext" +NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" +NSS_INCLUDE_MARKER="nss/nss.h" +NSS_LIB_MARKER="libnss3$shrext" +NSS_LIBS_LIST="-lnss3 -lsmime3" +XMLSEC_NO_NSS="1" +NSPR_INCLUDE_PATH= +NSPR_LIB_PATH= +NSS_INCLUDE_PATH= +NSS_LIB_PATH= +NSS_FOUND="no" +NSPR_FOUND="no" +AC_ARG_WITH([nss], [AC_HELP_STRING([--with-nss@<:@=PFX@:>@], [nss location])]) +AC_ARG_WITH([nspr], [AC_HELP_STRING([--with-nspr@<:@=PFX@:>@], [nspr location (needed for NSS)])]) +AC_ARG_WITH([seamonkey_ver], [AC_HELP_STRING([--with-seamonkey-ver@<:@=VER@:>@], [mozilla version (alt to --with-nss, --with-nspr)])]) +AC_ARG_WITH([mozilla_ver], [AC_HELP_STRING([--with-mozilla-ver@<:@=VER@:>@], [mozilla version (alt to --with-nss, --with-nspr)])]) -dnl if nss is disabled, bail out early -AC_ARG_WITH(nss, [ --with-nss=[PFX] nss location]) -AC_ARG_WITH(nspr, [ --with-nspr=[PFX] nspr location (needed for NSS)]) -AC_ARG_WITH(seamonkey_ver, [ --with-seamonkey-ver=[VER] mozilla version (alt to --with-nss, --with-nspr)]) -AC_ARG_WITH(mozilla_ver, [ --with-mozilla-ver=[VER] mozilla version (alt to --with-nss, --with-nspr)]) +dnl Priority 0: Check if library is disabled if test "z$with_nss" = "zno" -o "z$with_nspr" = "zno" ; then - AC_MSG_CHECKING(for NSS libraries) - AC_MSG_RESULT(no) - NSS_FOUND="without" -elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then - dnl - dnl Mozilla's NSS/NSPR are distributed under different names - dnl in different distribution: - dnl seamonkey-nspr and seamonkey-nss - dnl mozilla-nspr and mozilla-nss - dnl xulrunner-nspr and xulrunner-nss - dnl nspr and nss - dnl We are going to try all options - dnl + NSS_FOUND="disabled" + NSPR_FOUND="disabled" +fi + +dnl Priority 1: User specifies the path to installation +if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then + AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) + if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then + NSPR_INCLUDE_PATH="$with_nspr/include" + NSPR_LIB_PATH="$with_nspr/lib" + NSPR_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) + fi +fi +if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then + AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) + if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then + NSS_INCLUDE_PATH="$with_nss/include" + NSS_LIB_PATH="$with_nss/lib" + NSS_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) + fi +fi + +dnl Priority 2: User sets both CFLAGS and LIBS flags +if test "z$NSPR_FOUND" = "zno" -a "z$NSPR_CFLAGS" != "z" -a "z$NSPR_LIBS" != "z" ; then + NSPR_FOUND="yes" +fi +if test "z$NSS_FOUND" = "zno" -a "z$NSS_CFLAGS" != "z" -a "z$NSS_LIBS" != "z" ; then + NSS_FOUND="yes" +fi + +dnl Priority 3: Guess with pkg_config +dnl +dnl Mozilla's NSS/NSPR are distributed under different names in different distribution, +dnl we are going to try all options: +dnl seamonkey-nspr and seamonkey-nss +dnl mozilla-nspr and mozilla-nss +dnl xulrunner-nspr and xulrunner-nss +dnl nspr and nss +if test "z$NSPR_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then + if test "z$NSPR_FOUND" = "zno" ; then + PKG_CHECK_MODULES(NSPR, seamonkey-nspr >= $NSPR_MIN_VERSION, + [NSPR_FOUND=yes NSPR_PACKAGE=seamonkey-nspr], + [NSPR_FOUND=no]) + fi + if test "z$NSPR_FOUND" = "zno" ; then + PKG_CHECK_MODULES(NSPR, mozilla-nspr >= $MOZILLA_MIN_VERSION, + [NSPR_FOUND=yes NSPR_PACKAGE=mozilla-nspr], + [NSPR_FOUND=no]) + fi + if test "z$NSPR_FOUND" = "zno" ; then + PKG_CHECK_MODULES(NSPR, xulrunner-nspr >= $NSPR_MIN_VERSION, + [NSPR_FOUND=yes NSPR_PACKAGE=xulrunner-nspr], + [NSPR_FOUND=no]) + fi + if test "z$NSPR_FOUND" = "zno" ; then + PKG_CHECK_MODULES(NSPR, nspr >= $NSPR_MIN_VERSION, + [NSPR_FOUND=yes NSPR_PACKAGE=nspr], + [NSPR_FOUND=no]) + fi +fi +if test "z$NSS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then if test "z$NSS_FOUND" = "zno" ; then - PKG_CHECK_MODULES(NSS, seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION, - [NSS_FOUND=yes NSPR_PACKAGE=seamonkey-nspr NSS_PACKAGE=seamonkey-nss], - [NSS_FOUND=no]) + PKG_CHECK_MODULES(NSS, seamonkey-nss >= $SEAMONKEY_MIN_VERSION, + [NSS_FOUND=yes NSS_PACKAGE=seamonkey-nss], + [NSS_FOUND=no]) fi if test "z$NSS_FOUND" = "zno" ; then - PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION, - [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss], - [NSS_FOUND=no]) + PKG_CHECK_MODULES(NSS, mozilla-nss >= $MOZILLA_MIN_VERSION, + [NSS_FOUND=yes NSS_PACKAGE=mozilla-nss], + [NSS_FOUND=no]) fi if test "z$NSS_FOUND" = "zno" ; then - PKG_CHECK_MODULES(NSS, xulrunner-nspr >= $NSPR_MIN_VERSION xulrunner-nss >= $NSS_MIN_VERSION, - [NSS_FOUND=yes NSPR_PACKAGE=xulrunner-nspr NSS_PACKAGE=xulrunner-nss], - [NSS_FOUND=no]) + PKG_CHECK_MODULES(NSS, xulrunner-nss >= $NSS_MIN_VERSION, + [NSS_FOUND=yes NSS_PACKAGE=xulrunner-nss], + [NSS_FOUND=no]) fi if test "z$NSS_FOUND" = "zno" ; then - PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION, - [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss], - [NSS_FOUND=no]) + PKG_CHECK_MODULES(NSS, nss >= $NSS_MIN_VERSION, + [NSS_FOUND=yes NSS_PACKAGE=nss], + [NSS_FOUND=no]) fi fi -if test "z$NSS_FOUND" = "zno" ; then - dnl process the mozilla options if any - if test "z$with_seamonkey_ver" != "z" ; then - ac_mozilla_name=seamonkey-$with_seamonkey_ver - elif test "z$with_mozilla_ver" != "z" ; then - ac_mozilla_name=mozilla-$with_mozilla_ver - else - ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION - fi - - ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name" - ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name" - - AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION) - NSPR_INCLUDES_FOUND="no" - NSPR_LIBS_FOUND="no" - NSPR_FOUND="no" - NSPR_PRINIT_H="" - - if test "z$with_nspr" != "z" ; then - NSPR_PREFIX="$with_nspr" - NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr" - if test "z$with_gnu_ld" = "zyes" ; then - NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST" - else - NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST" - fi - NSPR_INCLUDES_FOUND="yes" - NSPR_LIBS_FOUND="yes" - NSPR_PRINIT_H="$with_nspr/include/prinit.h" +dnl Priority 4: Guess using a list of folders using mozilla/seamonkey version hints (if any) +if test "z$with_seamonkey_ver" != "z" ; then + NSS_MOZILLA_NAME=seamonkey-$with_seamonkey_ver +elif test "z$with_mozilla_ver" != "z" ; then + NSS_MOZILLA_NAME=mozilla-$with_mozilla_ver +else + NSS_MOZILLA_NAME=mozilla-$MOZILLA_MIN_VERSION +fi +NSS_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/include/mozilla /usr/local/include/mozilla /usr/include/$NSS_MOZILLA_NAME /usr/local/include/$NSS_MOZILLA_NAME" +NSS_LIB_DIR="$COMMON_LIB_DIR /usr/lib/$NSS_MOZILLA_NAME /usr/local/lib/$NSS_MOZILLA_NAME" +if test "z$NSPR_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then + AC_MSG_CHECKING(for nspr library installation in the typical folders) + if test "z$NSPR_INCLUDE_PATH" = "z" ; then + AX_FIND_FOLDER(NSPR_INCLUDE_PATH, $NSPR_INCLUDE_MARKER, $NSS_INCLUDE_DIR) + fi + if test "z$NSPR_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(NSPR_LIB_PATH, $NSPR_LIB_MARKER, $NSS_LIB_DIR) + fi + if test "z$NSPR_INCLUDE_PATH" != "z" -a "z$NSPR_LIB_PATH" != "z" ; then + NSPR_FOUND=yes + AC_MSG_RESULT([yes ("-I$NSPR_INCLUDE_PATH -L$NSPR_LIB_PATH")]) else - for dir in $ac_nss_inc_dir ; do - if test -f $dir/nspr/prinit.h ; then - dnl do not add -I/usr/include because compiler does it anyway - if test "z$dir" = "z/usr/include" ; then - NSPR_CFLAGS="" - else - NSPR_CFLAGS="-I$dir/nspr" - fi - NSPR_INCLUDES_FOUND="yes" - NSPR_PRINIT_H="$dir/nspr/prinit.h" - break - fi - done - - for dir in $ac_nss_lib_dir ; do - if test -f $dir/libnspr4$shrext ; then - dnl do not add -L/usr/lib because compiler does it anyway - if test "z$dir" = "z/usr/lib" ; then - NSPR_LIBS="$NSPR_LIBS_LIST" - else - if test "z$with_gnu_ld" = "zyes" ; then - NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST" - else - NSPR_LIBS="-L$dir $NSPR_LIBS_LIST" - fi - fi - NSPR_LIBS_FOUND="yes" - break - fi - done - fi - - if test "z$NSPR_INCLUDES_FOUND" = "zyes" -a "z$NSPR_LIBS_FOUND" = "zyes" ; then - OLD_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$NSPR_CFLAGS" - AC_EGREP_CPP(yes,[ - #include - #if PR_VMAJOR >= 4 - yes - #endif - ],[ - NSPR_FOUND=yes - ],[ - NSPR_FOUND=no - ]) - CPPFLAGS="$OLD_CPPFLAGS" - fi - - if test "z$NSPR_FOUND" = "zyes" ; then - AC_MSG_RESULT(yes) + AC_MSG_RESULT([not found]) + fi +fi +if test "z$NSS_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then + AC_MSG_CHECKING(for nss library installation in the typical folders) + if test "z$NSS_INCLUDE_PATH" = "z" ; then + AX_FIND_FOLDER(NSS_INCLUDE_PATH, $NSS_INCLUDE_MARKER, $NSS_INCLUDE_DIR) + fi + if test "z$NSS_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(NSS_LIB_PATH, $NSS_LIB_MARKER, $NSS_LIB_DIR) + fi + if test "z$NSS_INCLUDE_PATH" != "z" -a "z$NSS_LIB_PATH" != "z" ; then + NSS_FOUND=yes + AC_MSG_RESULT([yes ("-I$NSS_INCLUDE_PATH -L$NSS_LIB_PATH")]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([not found]) fi +fi - dnl look for nss - AC_MSG_CHECKING(for nss libraries >= $NSS_MIN_VERSION) - NSS_INCLUDES_FOUND="no" - NSS_LIBS_FOUND="no" - NSS_NSS_H="" +dnl Priority 5 (NSPR): Just try to compile/link and hope for the best +if test "z$NSPR_FOUND" = "zno" ; then + AC_MSG_CHECKING(for nspr library installation) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $NSPR_LIBS $NSPR_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + #include + ]],[[ + int main () { printf("v=%s\n", PR_GetVersion()); return(0); } + ]]) + ],[ + NSPR_FOUND=yes + NSPR_LIBS="$NSPR_LIBS $NSPR_LIBS_LIST" + AC_MSG_RESULT([yes]) + ],[ + NSPR_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi - if test "z$with_nss" != "z" ; then - NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss" - if test "z$with_gnu_ld" = "zyes" ; then - NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" - else - NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST" - fi - NSS_INCLUDES_FOUND="yes" - NSS_LIBS_FOUND="yes" - NSS_NSS_H="$with_nss/include/nss.h" - else - for dir in $ac_nss_inc_dir ; do - if test -f $dir/nss/nss.h ; then - dnl do not add -I/usr/include because compiler does it anyway - if test "z$dir" = "z/usr/include" ; then - NSS_CFLAGS="$NSS_CFLAGS" - else - NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss" - fi - NSS_INCLUDES_FOUND="yes" - NSS_NSS_H="$dir/nss/nss.h" - break - fi - done - - for dir in $ac_nss_lib_dir ; do - if test -f $dir/libnss3$shrext ; then - dnl do not add -L/usr/lib because compiler does it anyway - if test "z$dir" = "z/usr/lib" ; then - NSS_LIBS="$NSS_LIBS_LIST" - else - if test "z$with_gnu_ld" = "zyes" ; then - NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST" - else - NSS_LIBS="-L$dir $NSS_LIBS_LIST" - fi - fi - NSS_LIBS_FOUND="yes" - break - fi - done - fi - - if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then - OLD_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$NSPR_CFLAGS $NSS_CFLAGS" - AC_EGREP_CPP(yes,[ - #include - #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 - yes - #endif - ],[ - NSS_FOUND=yes - ],[ - NSS_FOUND=no - ]) - CPPFLAGS="$OLD_CPPFLAGS" - fi - - if test "z$NSS_FOUND" = "zyes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) +dnl NSRP: Set flags if INCLUDE_PATH or LIB_PATH are set (need to do it before we try to find NSS) +if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_INCLUDE_PATH" != "z" ; then + NSPR_CFLAGS="$NSPR_CFLAGS -I$NSPR_INCLUDE_PATH -I$NSPR_INCLUDE_PATH/nspr" +fi +if test "z$NSPR_FOUND" = "zyes" -a "z$NSPR_LIB_PATH" != "z" ; then + if test "z$with_gnu_ld" = "zyes" ; then + NSPR_LIBS="$NSPR_LIBS -Wl,-rpath-link -Wl,$NSPR_LIB_PATH" fi + NSPR_LIBS="$NSPR_LIBS -L$NSPR_LIB_PATH/lib $NSPR_LIBS_LIST" +fi + +dnl Priority 5 (NSS): Just try to compile/link and hope for the best +if test "z$NSS_FOUND" = "zno" ; then + AC_MSG_CHECKING(for nss library installation) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS $NSS_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $NSS_LIBS $NSPR_LIBS $NSS_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + #include + ]],[[ + int main () { printf("v=%s\n", NSS_GetVersion()); return(0); } + ]]) + ],[ + NSS_FOUND=yes + NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST" + AC_MSG_RESULT([yes]) + ],[ + NSS_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi - dnl check that we have found both NSS and NSPR - if test "z$NSPR_FOUND" = "zyes" -a "z$NSS_FOUND" = "zyes" ; then - NSS_CFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" - NSS_LIBS="$NSS_LIBS $NSPR_LIBS" - elif test "z$NSPR_FOUND" != "zyes" -a "z$NSS_FOUND" = "zyes" ; then - NSS_FOUND="no" - AC_MSG_RESULT(NSPR library is required for NSS, ignoring NSS library we have found) +dnl NSS: Set flags if INCLUDE_PATH or LIB_PATH are set +if test "z$NSS_FOUND" = "zyes" -a "z$NSS_INCLUDE_PATH" != "z" ; then + NSS_CFLAGS="$NSS_CFLAGS -I$NSS_INCLUDE_PATH -I$NSS_INCLUDE_PATH/nss" +fi +if test "z$NSS_FOUND" = "zyes" -a "z$NSS_LIB_PATH" != "z" ; then + if test "z$with_gnu_ld" = "zyes" ; then + NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$NSS_LIB_PATH" fi + NSS_LIBS="$NSS_LIBS -L$NSS_LIB_PATH/lib $NSS_LIBS_LIST" fi +dnl Check NSS and NSPR versions +AC_MSG_CHECKING(for nspr library >= $NSPR_MIN_VERSION) +if test "z$NSPR_FOUND" = "zyes" ; then + minvers=`echo $NSPR_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'` + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS" + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if ((PR_VMAJOR * 100 + PR_VMINOR) * 100 + PR_VPATCH) >= $minvers + greater-than-minvers + #endif + ],[ + NSPR_FOUND=yes + ],[ + NSPR_FOUND=no + ]) + CPPFLAGS="$OLD_CPPFLAGS" +fi +AC_MSG_RESULT([$NSPR_FOUND]) + +AC_MSG_CHECKING(for nss library >= $NSS_MIN_VERSION) +if test "z$NSS_FOUND" = "zyes" ; then + minvers=`echo $NSS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 100 + $2) * 100 + $3;}'` + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS $NSS_CFLAGS" + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if ((NSS_VMAJOR * 100 + NSS_VMINOR) * 100 + NSS_VPATCH) >= $minvers + greater-than-minvers + #endif + ],[ + NSS_FOUND=yes + ],[ + NSS_FOUND=no + ]) + CPPFLAGS="$OLD_CPPFLAGS" +fi +AC_MSG_RESULT([$NSS_FOUND]) + +dnl Check that we have found both NSS and NSPR +if test "z$NSPR_FOUND" = "zyes" -a "z$NSS_FOUND" = "zyes" ; then + NSS_CFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" + NSS_LIBS="$NSS_LIBS $NSPR_LIBS" +elif test "z$NSPR_FOUND" != "zyes" -a "z$NSS_FOUND" = "zyes" ; then + NSS_FOUND="no" + AC_MSG_RESULT([NSPR library is required for NSS, ignoring NSS library we have found]) +fi + +dnl Finally set all the flags if test "z$NSS_FOUND" = "zyes" ; then XMLSEC_NO_NSS="0" NSS_CFLAGS="$NSS_CFLAGS -DXMLSEC_CRYPTO_NSS=1" @@ -839,66 +1185,175 @@ AC_SUBST(NSS_MIN_VERSION) AC_SUBST(NSPR_MIN_VERSION) AC_SUBST(MOZILLA_MIN_VERSION) - dnl ========================================================================== dnl See if we can find GCrypt dnl ========================================================================== -GCRYPT_CONFIG="libgcrypt-config" -XMLSEC_NO_GCRYPT="1" GCRYPT_MIN_VERSION="1.4.0" -GCRYPT_VERSION="" -GCRYPT_CFLAGS="" -GCRYPT_LIBS="" +GCRYPT_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/gcrypt/include" +GCRYPT_LIB_DIR="$COMMON_LIB_DIR /usr/local/gcrypt/lib" +GCRYPT_CONFIG="libgcrypt-config" +GCRYPT_INCLUDE_MARKER="gcrypt.h" +GCRYPT_LIB_MARKER="libgcrypt$shrext" GCRYPT_CRYPTO_LIB="$XMLSEC_PACKAGE-gcrypt" +GCRYPT_LIBS_LIST="-lgcrypt" + +XMLSEC_NO_GCRYPT="1" +GCRYPT_VERSION= +GCRYPT_INCLUDE_PATH= +GCRYPT_LIB_PATH= GCRYPT_FOUND="no" -AC_ARG_WITH(gcrypt, [ --with-gcrypt=[PFX] gcrypt location]) +AC_ARG_WITH([gcrypt], [AC_HELP_STRING([--with-gcrypt@<:@=PFX@:>@], [gcrypt location])]) + +dnl Priority 0: Check if library is not needed if test "z$with_gcrypt" = "zno" ; then - AC_MSG_CHECKING(for gcrypt libraries >= $GCRYPT_MIN_VERSION) - AC_MSG_RESULT(no) - GCRYPT_FOUND="without" -elif test "z$with_gcrypt" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then - PKG_CHECK_MODULES(GCRYPT, gcrypt >= $GCRYPT_MIN_VERSION, - [GCRYPT_FOUND=yes], - [GCRYPT_FOUND=no]) + GCRYPT_FOUND="disabled" +fi - if test "z$GCRYPT_FOUND" = "zno" ; then - PKG_CHECK_MODULES(GCRYPT, libgcrypt >= $GCRYPT_MIN_VERSION, - [GCRYPT_FOUND=yes], - [GCRYPT_FOUND=no]) +dnl Priority 1: User specifies the path to installation +if test "z$GCRYPT_FOUND" = "zno" -a "z$with_gcrypt" != "z" -a "z$with_gcrypt" != "zyes" ; then + AC_MSG_CHECKING(for libgcrypt library installation in "$with_gcrypt" folder) + if test "z$ENABLE_CUSTOM_CONFIGS" = "zyes" -a -f "$with_gcrypt/bin/$GCRYPT_CONFIG" ; then + GCRYPT_CONFIG_PATH="$with_gcrypt/bin/$GCRYPT_CONFIG" + GCRYPT_FOUND="yes" + AC_MSG_RESULT([yes]) + elif test -f "$with_gcrypt/include/$GCRYPT_INCLUDE_MARKER" -a -f "$with_gcrypt/lib/$GCRYPT_LIB_MARKER" ; then + GCRYPT_INCLUDE_PATH="$with_gcrypt/include" + GCRYPT_LIB_PATH="$with_gcrypt/lib" + GCRYPT_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_gcrypt/bin/$GCRYPT_CONFIG" tool, or "$with_gcrypt/include/$GCRYPT_INCLUDE_MARKER" and/or "$with_gcrypt/lib/$GCRYPT_LIB_MARKER" files don't exist), typo?]) fi +fi + +dnl Priority 2: User sets both CFLAGS and LIBS flags +if test "z$GCRYPT_FOUND" = "zno" -a "z$GCRYPT_CFLAGS" != "z" -a "z$GCRYPT_LIBS" != "z" ; then + GCRYPT_FOUND="yes" +fi +dnl Priority 3: Guess with pkg_config +if test "z$GCRYPT_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then + if test "z$GCRYPT_FOUND" = "zno" ; then + PKG_CHECK_MODULES(GCRYPT, gcrypt >= $GCRYPT_MIN_VERSION, + [GCRYPT_FOUND=yes], + [GCRYPT_FOUND=no]) + fi + if test "z$GCRYPT_FOUND" = "zno" ; then + PKG_CHECK_MODULES(GCRYPT, libgcrypt20 >= $GCRYPT_MIN_VERSION, + [GCRYPT_FOUND=yes], + [GCRYPT_FOUND=no]) + fi if test "z$GCRYPT_FOUND" = "zno" ; then PKG_CHECK_MODULES(GCRYPT, libgcrypt11 >= $GCRYPT_MIN_VERSION, - [GCRYPT_FOUND=yes], - [GCRYPT_FOUND=no]) + [GCRYPT_FOUND=yes], + [GCRYPT_FOUND=no]) + fi + if test "z$GCRYPT_FOUND" = "zno" ; then + PKG_CHECK_MODULES(GCRYPT, libgcrypt >= $GCRYPT_MIN_VERSION, + [GCRYPT_FOUND=yes], + [GCRYPT_FOUND=no]) fi fi +dnl Priority 4: Guess the config tool location +if test "z$GCRYPT_FOUND" = "zno" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then + AC_PATH_PROG(GCRYPT_CONFIG_PATH, [$GCRYPT_CONFIG], [], [$PATH]) + if test "z$GCRYPT_CONFIG_PATH" != "z" ; then + GCRYPT_FOUND="yes" + fi +fi + +dnl Priority 5: Guess using a list of folders. +if test "z$GCRYPT_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then + AC_MSG_CHECKING(for libgcrypt library installation in the typical folders) + if test "z$GCRYPT_INCLUDE_PATH" = "z" ; then + AX_FIND_FOLDER(GCRYPT_INCLUDE_PATH, $GCRYPT_INCLUDE_MARKER, $GCRYPT_INCLUDE_DIR) + fi + if test "z$GCRYPT_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(GCRYPT_LIB_PATH, $GCRYPT_LIB_MARKER, $GCRYPT_LIB_DIR) + fi + if test "z$GCRYPT_INCLUDE_PATH" != "z" -a "z$GCRYPT_LIB_PATH" != "z" ; then + GCRYPT_FOUND="yes" + AC_MSG_RESULT([yes ("-I$GCRYPT_INCLUDE_PATH -L$GCRYPT_LIB_PATH")]) + else + AC_MSG_RESULT([not found]) + fi +fi + +dnl Priority 6: Just try to compile/link and hope for the best if test "z$GCRYPT_FOUND" = "zno" ; then - AC_MSG_CHECKING(for gcrypt libraries >= $GCRYPT_MIN_VERSION) - if test "z$with_gcrypt" != "z" ; then - GCRYPT_CONFIG=$with_gcrypt/bin/$GCRYPT_CONFIG - fi - if ! $GCRYPT_CONFIG --version > /dev/null 2>&1 ; then - if test "z$with_gcrypt" != "z" ; then - AC_MSG_ERROR(Unable to find gcrypt at '$with_gcrypt') - else - AC_MSG_RESULT(no) - fi + AC_MSG_CHECKING(for gcrypt library installation) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $GCRYPT_LIBS $GCRYPT_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + ]],[[ + int main () { printf("v=%s\n", gcry_check_version("0")); return(0); } + ]]) + ],[ + GCRYPT_FOUND=yes + GCRYPT_LIBS="$GCRYPT_LIBS $GCRYPT_LIBS_LIST" + AC_MSG_RESULT([yes]) + ],[ + GCRYPT_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi + +dnl Set CFLAGS/LIBS flags +if test "z$GCRYPT_FOUND" = "zyes" ; then + if test "z$GCRYPT_CONFIG_PATH" != "z" -a "z$ENABLE_CUSTOM_CONFIGS" = "zyes" ; then + dnl Get the values using config tool (overwrite CFLAGS/LIBS!) + if test "z$GCRYPT_CFLAGS" = "z" ; then + GCRYPT_CFLAGS="`$GCRYPT_CONFIG_PATH --cflags`" + fi + if test "z$GCRYPT_LIBS" = "z"; then + GCRYPT_LIBS="`$GCRYPT_CONFIG_PATH --libs`" + fi + GCRYPT_CONFIG=$GCRYPT_CONFIG_PATH + GCRYPT_FOUND="yes" else - vers=`$GCRYPT_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - minvers=`echo $GCRYPT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge "$minvers" ; then - GCRYPT_CFLAGS="$GCRYPT_CFLAGS `$GCRYPT_CONFIG --cflags`" - GCRYPT_LIBS="$GCRYPT_LIBS `$GCRYPT_CONFIG --libs`" - GCRYPT_FOUND=yes - else - AC_MSG_ERROR(You need at least gcrypt $GCRYPT_MIN_VERSION for this version of $XMLSEC_PACKAGE) - fi + dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!) + if test "z$GCRYPT_INCLUDE_PATH" != "z" ; then + GCRYPT_CFLAGS="$GCRYPT_CFLAGS -I$GCRYPT_INCLUDE_PATH" + fi + if test "z$GCRYPT_LIB_PATH" != "z" ; then + if test "z$with_gnu_ld" = "zyes" ; then + GCRYPT_LIBS="$GCRYPT_LIBS -Wl,-rpath-link -Wl,$GCRYPT_LIB_PATH" + fi + GCRYPT_LIBS="$GCRYPT_LIBS -L$GCRYPT_LIB_PATH $GCRYPT_LIBS_LIST" + fi fi fi -if test "z$GCRYPT_FOUND" = "zyes" ; then +dnl Verify the version +AC_MSG_CHECKING(for libgcrypt library >= $GCRYPT_MIN_VERSION) +if test "z$GCRYPT_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS" + dnl gcrypt uses hex digits for version number + minvers=`echo $GCRYPT_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 256 + $2) * 256 + $3;}'` + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if GCRYPT_VERSION_NUMBER >= $minvers + greater-than-minvers + #endif + ],[ + GCRYPT_FOUND=yes + ], [ + GCRYPT_FOUND=no + ]) + CPPFLAGS=$OLD_CPPFLAGS +fi +AC_MSG_RESULT([$GCRYPT_FOUND]) + +dnl Finally set variables +if test "z$GCRYPT_FOUND" = "zyes" ; then XMLSEC_NO_GCRYPT="0" GCRYPT_CFLAGS="$GCRYPT_CFLAGS -DXMLSEC_CRYPTO_GCRYPT=1" XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gcrypt" @@ -913,68 +1368,148 @@ AC_SUBST(GCRYPT_LIBS) AC_SUBST(GCRYPT_CRYPTO_LIB) AC_SUBST(GCRYPT_MIN_VERSION) - dnl ========================================================================== dnl See if we can find GnuTLS dnl ========================================================================== -GNUTLS_CONFIG="libgnutls-config" -XMLSEC_NO_GNUTLS="1" GNUTLS_MIN_VERSION="2.8.0" -GNUTLS_VERSION="" -GNUTLS_CFLAGS="" -GNUTLS_LIBS="" +GNUTLS_INCLUDE_DIR="$COMMON_INCLUDE_DIR /usr/local/gnutls/include" +GNUTLS_LIB_DIR="$COMMON_LIB_DIR /usr/local/gnutls/lib" +GNUTLS_INCLUDE_MARKER="gnutls/gnutls.h" +GNUTLS_LIB_MARKER="libgnutls$shrext" GNUTLS_CRYPTO_LIB="$XMLSEC_PACKAGE-gnutls" +GNUTLS_LIBS_LIST="-lgnutls" + +XMLSEC_NO_GNUTLS="1" +GNUTLS_INCLUDE_PATH= +GNUTLS_LIB_PATH= GNUTLS_FOUND="no" -AC_ARG_WITH(gnutls, [ --with-gnutls=[PFX] gnutls location]) +AC_ARG_WITH([gnutls], [AC_HELP_STRING([--with-gnutls@<:@=PFX@:>@], [gnutls location])]) + +dnl Priority 0: Check if library is not needed if test "z$with_gnutls" = "zno" ; then - AC_MSG_CHECKING(for gnutls libraries >= $GNUTLS_MIN_VERSION) - AC_MSG_RESULT(no) - GNUTLS_FOUND="without" -elif test "z$with_gnutls" = "z" -a "z$PKGCONFIG_FOUND" = "zyes" ; then - PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_MIN_VERSION, - [GNUTLS_FOUND=yes], - [GNUTLS_FOUND=no]) - if test "z$GNUTLS_FOUND" = "zno" ; then + GNUTLS_FOUND="disabled" +fi + +dnl Priority 1: User specifies the path to installation +if test "z$GNUTLS_FOUND" = "zno" -a "z$with_gnutls" != "z" -a "z$with_gnutls" != "zyes" ; then + AC_MSG_CHECKING(for libgnutls library installation in "$with_gnutls" folder) + if test -f "$with_gnutls/include/$GNUTLS_INCLUDE_MARKER" -a -f "$with_gnutls/lib/$GNUTLS_LIB_MARKER" ; then + GNUTLS_INCLUDE_PATH="$with_gnutls/include" + GNUTLS_LIB_PATH="$with_gnutls/lib" + GNUTLS_FOUND="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([not found: "$with_gnutls/bin/$GNUTLS_CONFIG" tool, or "$with_gnutls/include/$GNUTLS_INCLUDE_MARKER" and/or "$with_gnutls/lib/$GNUTLS_LIB_MARKER" files don't exist), typo?]) + fi +fi + +dnl Priority 2: User sets both CFLAGS and LIBS flags +if test "z$GNUTLS_FOUND" = "zno" -a "z$GNUTLS_CFLAGS" != "z" -a "z$GNUTLS_LIBS" != "z" ; then + GNUTLS_FOUND="yes" +fi + +dnl Priority 3: Guess with pkg_config +if test "z$GNUTLS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then + if test "z$GNUTLS_FOUND" = "zno" ; then + PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_MIN_VERSION, + [GNUTLS_FOUND=yes], + [GNUTLS_FOUND=no]) + fi + if test "z$GNUTLS_FOUND" = "zno" ; then PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_MIN_VERSION, - [GNUTLS_FOUND=yes], - [GNUTLS_FOUND=no]) + [GNUTLS_FOUND=yes], + [GNUTLS_FOUND=no]) fi fi -if test "z$GNUTLS_FOUND" = "zno" ; then - AC_MSG_CHECKING(for gnutls libraries >= $GNUTLS_MIN_VERSION) - if test "z$with_gnutls" != "z" ; then - GNUTLS_CONFIG=$with_gnutls/bin/$GNUTLS_CONFIG - fi - if ! $GNUTLS_CONFIG --version > /dev/null 2>&1 ; then - if test "z$with_gnutls" != "z" ; then - AC_MSG_ERROR(Unable to find gnutls at '$with_gnutls') - else - AC_MSG_RESULT(no) - fi +dnl Priority 4: Guess using a list of folders. +if test "z$GNUTLS_FOUND" = "zno" -a "z$ENABLE_FOLDERS_SEARCH" = "zyes" ; then + AC_MSG_CHECKING(for libgnutls library installation in the typical folders) + if test "z$GNUTLS_INCLUDE_PATH" = "z" ; then + AX_FIND_FOLDER(GNUTLS_INCLUDE_PATH, $GNUTLS_INCLUDE_MARKER, $GNUTLS_INCLUDE_DIR) + fi + if test "z$GNUTLS_LIB_PATH" = "z" ; then + AX_FIND_FOLDER(GNUTLS_LIB_PATH, $GNUTLS_LIB_MARKER, $GNUTLS_LIB_DIR) + fi + if test "z$GNUTLS_INCLUDE_PATH" != "z" -a "z$GNUTLS_LIB_PATH" != "z" ; then + GNUTLS_FOUND="yes" + AC_MSG_RESULT([yes ("-I$GNUTLS_INCLUDE_PATH -L$GNUTLS_LIB_PATH")]) else - vers=`$GNUTLS_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge "$minvers" ; then - GNUTLS_CFLAGS="$GNUTLS_CFLAGS `$GNUTLS_CONFIG --cflags`" - GNUTLS_LIBS="$GNUTLS_LIBS `$GNUTLS_CONFIG --libs`" - GNUTLS_FOUND=yes - else - AC_MSG_ERROR(You need at least gnutls $GNUTLS_MIN_VERSION for this version of $XMLSEC_PACKAGE) - fi + AC_MSG_RESULT([not found]) fi fi -if test "z$GNUTLS_FOUND" = "zyes" ; then - XMLSEC_NO_GNUTLS="0" - GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1" - XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls" +dnl Priority 5: Just try to compile/link and hope for the best +if test "z$GNUTLS_FOUND" = "zno" ; then + AC_MSG_CHECKING(for gnutls library installation) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $GCRYPT_CFLAGS $GNUTLS_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $GNUTLS_LIBS $GCRYPT_LIBS $GNUTLS_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + ]],[[ + int main () { gnutls_global_init(); return(0); } + ]]) + ],[ + GNUTLS_FOUND=yes + GNUTLS_LIBS="$GNUTLS_LIBS $GNUTLS_LIBS_LIST" + AC_MSG_RESULT([yes]) + ],[ + GNUTLS_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi - dnl xmlsec-gnutls is using xmlsec-gcrypt - if test "z$GCRYPT_FOUND" != "zyes" ; then - AC_MSG_ERROR(xmlsec-gnutls library requires xmlsec-gcrypt library which is disabled or missing) +dnl Set CFLAGS/LIBS flags +if test "z$GNUTLS_FOUND" = "zyes" ; then + dnl Set flags if INCLUDE_PATH or LIB_PATH are set (do NOT overwrite CFLAGS/LIBS!) + if test "z$GNUTLS_INCLUDE_PATH" != "z" ; then + GNUTLS_CFLAGS="$GNUTLS_CFLAGS -I$GNUTLS_INCLUDE_PATH" fi + if test "z$GNUTLS_LIB_PATH" != "z" ; then + if test "z$with_gnu_ld" = "zyes" ; then + GNUTLS_LIBS="$GNUTLS_LIBS -Wl,-rpath-link -Wl,$GNUTLS_LIB_PATH" + fi + GNUTLS_LIBS="$GNUTLS_LIBS -L$GNUTLS_LIB_PATH $GNUTLS_LIBS_LIST" + fi +fi +dnl Verify the version +AC_MSG_CHECKING(for libgnutls library >= $GNUTLS_MIN_VERSION) +if test "z$GNUTLS_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS" + dnl gnutls uses hex digits for version number + minvers=`echo $GNUTLS_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 256 + $2) * 256 + $3;}'` + AC_EGREP_CPP(greater-than-minvers, [ + #include + #if GNUTLS_VERSION_NUMBER >= $minvers + greater-than-minvers + #endif + ],[ + GNUTLS_FOUND=yes + ],[ + GNUTLS_FOUND=no + ]) + CPPFLAGS=$OLD_CPPFLAGS +fi +AC_MSG_RESULT([$GNUTLS_FOUND]) + +dnl Check that we have found gcrypt +if test "z$GNUTLS_FOUND" = "zyes" -a "z$GCRYPT_FOUND" != "zyes" ; then + GNUTLS_FOUND="no" + AC_MSG_RESULT([xmlsec-gnutls library requires xmlsec-gcrypt library which is disabled or missing, ignoring libgnutls library we have found]) +fi + +dnl Finally set all the flags +if test "z$GNUTLS_FOUND" = "zyes" ; then + XMLSEC_NO_GNUTLS="0" + GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DXMLSEC_CRYPTO_GNUTLS=1" + XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST gnutls" else XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST gnutls" fi @@ -990,47 +1525,75 @@ AC_SUBST(GNUTLS_MIN_VERSION) dnl ========================================================================== dnl See if we can find MSCrypto dnl ========================================================================== -XMLSEC_NO_MSCRYPTO="1" -MSCRYPTO_CFLAGS="" -MSCRYPTO_LIBS="" MSCRYPTO_CRYPTO_LIB="$XMLSEC_PACKAGE-mscrypto" -MSCRYPTO_ENABLE='none' -AC_ARG_ENABLE(mscrypto, - [ --enable-mscrypto enable mscrypto (no)], - [MSCRYPTO_ENABLE=$enableval]) -if test "z$MSCRYPTO_ENABLE" != "zyes" ; then - AC_MSG_CHECKING(for mscrypto libraries) - AC_MSG_RESULT([$MSCRYPTO_ENABLE]) -else -dnl cannot detect __stdcall functions -dnl AC_CHECK_LIB(crypt32, CertOpenStore, .... - LIBS_SAVE="$LIBS" - LIBS="$LIBS -lcrypt32" - AC_MSG_CHECKING(for mscrypto libraries) - AC_LINK_IFELSE([AC_LANG_PROGRAM([ - #include - #include ],[ - int main () { CertOpenStore(0,0,0,0,0);; return(0); } - ])], - [], - [MSCRYPTO_ENABLE="no"]) - AC_MSG_RESULT([$MSCRYPTO_ENABLE]) - LIBS="$LIBS_SAVE" -fi - -if test "z$MSCRYPTO_ENABLE" = "zyes" ; then - XMLSEC_NO_MSCRYPTO="0" +case $host in +*-w64-mingw*) + MSCRYPTO_XMLSEC_DEFINES= + MSCRYPTO_LIBS_LIST="-lcrypt32" + ;; +*-*-mingw*) + dnl use own def-file and header as mingw.org crypt32 + dnl is limited (library and header) + MSCRYPTO_XMLSEC_DEFINES="-DXMLSEC_CUSTOM_CRYPT32=1" + MSCRYPTO_LIBS_LIST="-Wl,$(srcdir)/mingw-crypt32.def" + ;; +*) + MSCRYPTO_XMLSEC_DEFINES= + MSCRYPTO_LIBS_LIST="-lcrypt32" + ;; +esac - MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1" - case $host in - *-*-mingw*) - dnl since mingw crypt32 library is limited - dnl we use own def-file - MSCRYPTO_LIBS='-Wl,$(srcdir)/mingw-crypt32.def';; - *) - MSCRYPTO_LIBS="-lcrypt32";; - esac +XMLSEC_NO_MSCRYPTO="1" +MSCRYPTO_FOUND="no" +AC_ARG_ENABLE([mscrypto], [AC_HELP_STRING([--enable-mscrypto], [enable mscrypto (no)])]) + +dnl Priority 0: Check if library is not needed +if test "z$enable_mscrypto" = "zno" ; then + MSCRYPTO_FOUND="disabled" +fi + +dnl Priority 1: User sets both CFLAGS and LIBS flags +if test "z$MSCRYPTO_FOUND" = "zno" -a "z$MSCRYPTO_CFLAGS" != "z" -a "z$MSCRYPTO_LIBS" != "z" ; then + MSCRYPTO_FOUND=yes +fi +dnl Priority 2: Just try to compile/link and hope for the best +if test "z$MSCRYPTO_FOUND" = "zno" ; then + AC_MSG_CHECKING(for mscrypto) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $MSCRYPTO_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $MSCRYPTO_LIBS $MSCRYPTO_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + #include + ]],[[ + int main () { CertOpenStore(0,0,0,0,0);; return(0); } + ]]) + ],[ + MSCRYPTO_FOUND=yes + AC_MSG_RESULT([yes]) + ],[ + MSCRYPTO_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi + +dnl Set CFLAGS/LIBS flags, do not change CFLAGS/LIBS if both are set +if test "z$MSCRYPTO_FOUND" = "zyes" ; then + if test "z$MSCRYPTO_CFLAGS" = "z" -o "z$MSCRYPTO_LIBS" = "z" ; then + XMLSEC_DEFINES="$XMLSEC_DEFINES $MSCRYPTO_XMLSEC_DEFINES" + MSCRYPTO_LIBS="$MSCRYPTO_LIBS $MSCRYPTO_LIBS_LIST" + fi +fi + +dnl Finally set all the flags +if test "z$MSCRYPTO_FOUND" = "zyes" ; then + XMLSEC_NO_MSCRYPTO="0" + MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1" XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscrypto" else XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscrypto" @@ -1043,6 +1606,81 @@ AC_SUBST(MSCRYPTO_LIBS) AC_SUBST(MSCRYPTO_CRYPTO_LIB) +dnl ========================================================================== +dnl See if we can find MSCng +dnl ========================================================================== +MSCNG_CRYPTO_LIB="$XMLSEC_PACKAGE-mscng" +dnl This is tested on w64-mingw only so far. +MSCNG_XMLSEC_DEFINES= +MSCNG_LIBS_LIST="-lcrypt32 -lbcrypt -lncrypt" + +XMLSEC_NO_MSCNG="1" +MSCNG_FOUND="no" +AC_ARG_ENABLE([mscng], [AC_HELP_STRING([--enable-mscng], [enable mscng (no)])]) + +dnl Priority 0: Check if library is not needed +if test "z$enable_mscng" = "zno" ; then + MSCNG_FOUND="disabled" +fi + +dnl Priority 1: User sets both CFLAGS and LIBS flags +if test "z$MSCNG_FOUND" = "zno" -a "z$MSCNG_CFLAGS" != "z" -a "z$MSCNG_LIBS" != "z" ; then + MSCNG_FOUND=yes +fi + +dnl Priority 2: Just try to compile/link and hope for the best +if test "z$MSCNG_FOUND" = "zno" ; then + AC_MSG_CHECKING(for mscng) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $MSCNG_CFLAGS" + OLD_LIBS=$LIBS + LIBS="$LIBS $MSCNG_LIBS $MSCNG_LIBS_LIST" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include + #include + ]],[[ + int main () { + BCRYPT_ALG_HANDLE hAlg; + BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0); + return(0); + } + ]]) + ],[ + MSCNG_FOUND=yes + AC_MSG_RESULT([yes]) + ],[ + MSCNG_FOUND=no + AC_MSG_RESULT([not found]) + ]) + CPPFLAGS=$OLD_CPPFLAGS + LIBS=$OLD_LIBS +fi + +dnl Set CFLAGS/LIBS flags, do not change CFLAGS/LIBS if both are set +if test "z$MSCNG_FOUND" = "zyes" ; then + if test "z$MSCNG_CFLAGS" = "z" -o "z$MSCNG_LIBS" = "z" ; then + XMLSEC_DEFINES="$XMLSEC_DEFINES $MSCNG_XMLSEC_DEFINES" + MSCNG_LIBS="$MSCNG_LIBS $MSCNG_LIBS_LIST" + fi +fi + +dnl Finally set all the flags +if test "z$MSCNG_FOUND" = "zyes" ; then + XMLSEC_NO_MSCNG="0" + MSCNG_CFLAGS="$MSCNG_CFLAGS -DXMLSEC_CRYPTO_MSCNG=1" + XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mscng" +else + XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mscng" +fi + +AM_CONDITIONAL(XMLSEC_NO_MSCNG, [test "z$XMLSEC_NO_MSCNG" = "z1"]) +AC_SUBST(XMLSEC_NO_MSCNG) +AC_SUBST(MSCNG_CFLAGS) +AC_SUBST(MSCNG_LIBS) +AC_SUBST(MSCNG_CRYPTO_LIB) + + dnl ========================================================================== dnl Figure out the default crypt - the first crypto library wins dnl ========================================================================== @@ -1051,7 +1689,7 @@ XMLSEC_CRYPTO_LIB="" XMLSEC_CRYPTO_CFLAGS="" XMLSEC_CRYPTO_LIBS="" AC_MSG_CHECKING(for default crypto library) -AC_ARG_WITH(default_crypto, [ --with-default-crypto=name default crypto name]) +AC_ARG_WITH([default_crypto], [AC_HELP_STRING([--with-default-crypto=name], [default crypto name])]) # check the argument case "z$with_default_crypto" in @@ -1062,6 +1700,13 @@ case "z$with_default_crypto" in AC_MSG_ERROR('$with_default_crypto' is specified as default crypto library but it is not configured or found) fi ;; + 'zmscng') + if test "z$XMLSEC_NO_MSCNG" != "z1" ; then + XMLSEC_DEFAULT_CRYPTO="mscng" + else + AC_MSG_ERROR('$with_default_crypto' is specified as default crypto library but it is not configured or found) + fi + ;; 'zopenssl') if test "z$XMLSEC_NO_OPENSSL" != "z1" ; then XMLSEC_DEFAULT_CRYPTO="openssl" @@ -1094,6 +1739,8 @@ case "z$with_default_crypto" in dnl The first crypto library wins if test "z$XMLSEC_NO_MSCRYPTO" != "z1" ; then XMLSEC_DEFAULT_CRYPTO="mscrypto" + elif test "z$XMLSEC_NO_MSCNG" != "z1" ; then + XMLSEC_DEFAULT_CRYPTO="mscng" elif test "z$XMLSEC_NO_OPENSSL" != "z1" ; then XMLSEC_DEFAULT_CRYPTO="openssl" elif test "z$XMLSEC_NO_NSS" != "z1" ; then @@ -1118,6 +1765,11 @@ case "$XMLSEC_DEFAULT_CRYPTO" in XMLSEC_CRYPTO_CFLAGS="$MSCRYPTO_CFLAGS" XMLSEC_CRYPTO_LIBS="$MSCRYPTO_LIBS" ;; + 'mscng') + XMLSEC_CRYPTO_LIB="$MSCNG_CRYPTO_LIB" + XMLSEC_CRYPTO_CFLAGS="$MSCNG_CFLAGS" + XMLSEC_CRYPTO_LIBS="$MSCNG_LIBS" + ;; 'openssl') XMLSEC_CRYPTO_LIB="$OPENSSL_CRYPTO_LIB" XMLSEC_CRYPTO_CFLAGS="$OPENSSL_CFLAGS" @@ -1142,117 +1794,131 @@ case "$XMLSEC_DEFAULT_CRYPTO" in AC_MSG_ERROR(The value \"$XMLSEC_DEFAULT_CRYPTO\" is not a recongnized crypto library name) ;; esac -AC_MSG_RESULT(yes ('$XMLSEC_DEFAULT_CRYPTO')) +AC_MSG_RESULT([yes ("$XMLSEC_DEFAULT_CRYPTO")]) + +dnl ========================================================================== +dnl Do we need to use Unicode (Windows build only) +dnl ========================================================================== +if test "z$build_windows" = "zyes" ; then + AC_MSG_CHECKING(for Unicode support) + AC_ARG_ENABLE([unicode], [AC_HELP_STRING([--enable-unicode], [enable Unicode support on Windows (yes)])]) + if test "z$enable_unicode" = "zyes" ; then + XMLSEC_DEFINES="$XMLSEC_DEFINES -DUNICODE=1" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +fi dnl ========================================================================== dnl See do we need MD5 support dnl ========================================================================== -AC_MSG_CHECKING(for MD5 support) -AC_ARG_ENABLE(md5, [ --enable-md5 enable MD5 support (yes)]) +AC_MSG_CHECKING(for MD5 support) +AC_ARG_ENABLE([md5], [AC_HELP_STRING([--enable-md5], [enable MD5 support (yes)])]) if test "z$enable_md5" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_MD5=1" XMLSEC_NO_MD5="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_MD5="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_MD5, test "z$XMLSEC_NO_MD5" = "z1") AC_SUBST(XMLSEC_NO_MD5) dnl ========================================================================== dnl See do we need RIPEMD-160 support dnl ========================================================================== -AC_MSG_CHECKING(for RIPEMD-160 support) -AC_ARG_ENABLE(ripemd160, [ --enable-ripemd160 enable RIPEMD-160 support (yes)]) +AC_MSG_CHECKING(for RIPEMD-160 support) +AC_ARG_ENABLE([ripemd160], [AC_HELP_STRING([--enable-ripemd160], [enable RIPEMD-160 support (yes)])]) if test "z$enable_ripemd160" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RIPEMD160=1" XMLSEC_NO_RIPEMD160="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_RIPEMD160="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_RIPEMD160, test "z$XMLSEC_NO_RIPEMD160" = "z1") AC_SUBST(XMLSEC_NO_RIPEMD160) dnl ========================================================================== dnl See do we need SHA1 support dnl ========================================================================== -AC_MSG_CHECKING(for SHA1 support) -AC_ARG_ENABLE(sha1, [ --enable-sha1 enable SHA1 support (yes)]) +AC_MSG_CHECKING(for SHA1 support) +AC_ARG_ENABLE([sha1], [AC_HELP_STRING([--enable-sha1], [enable SHA1 support (yes)])]) if test "z$enable_sha1" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA1=1" XMLSEC_NO_SHA1="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_SHA1="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_SHA1, test "z$XMLSEC_NO_SHA1" = "z1") AC_SUBST(XMLSEC_NO_SHA1) dnl ========================================================================== dnl See do we need SHA224 support dnl ========================================================================== -AC_MSG_CHECKING(for SHA224 support) -AC_ARG_ENABLE(sha224, [ --enable-sha224 enable SHA224 support (yes)]) +AC_MSG_CHECKING(for SHA224 support) +AC_ARG_ENABLE([sha224], [AC_HELP_STRING([--enable-sha224], [enable SHA224 support (yes)])]) if test "z$enable_sha224" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA224=1" XMLSEC_NO_SHA224="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_SHA224="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_SHA224, test "z$XMLSEC_NO_SHA224" = "z1") AC_SUBST(XMLSEC_NO_SHA224) dnl ========================================================================== dnl See do we need SHA256 support dnl ========================================================================== -AC_MSG_CHECKING(for SHA256 support) -AC_ARG_ENABLE(sha256, [ --enable-sha256 enable SHA256 support (yes)]) +AC_MSG_CHECKING(for SHA256 support) +AC_ARG_ENABLE([sha256], [AC_HELP_STRING([--enable-sha256], [enable SHA256 support (yes)])]) if test "z$enable_sha256" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA256=1" XMLSEC_NO_SHA256="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_SHA256="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_SHA256, test "z$XMLSEC_NO_SHA256" = "z1") AC_SUBST(XMLSEC_NO_SHA256) dnl ========================================================================== dnl See do we need SHA384 support dnl ========================================================================== -AC_MSG_CHECKING(for SHA384 support) -AC_ARG_ENABLE(sha384, [ --enable-sha384 enable SHA384 support (yes)]) +AC_MSG_CHECKING(for SHA384 support) +AC_ARG_ENABLE([sha384], [AC_HELP_STRING([--enable-sha384], [enable SHA384 support (yes)])]) if test "z$enable_sha384" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA384=1" XMLSEC_NO_SHA384="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_SHA384="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_SHA384, test "z$XMLSEC_NO_SHA384" = "z1") AC_SUBST(XMLSEC_NO_SHA384) dnl ========================================================================== dnl See do we need SHA512 support dnl ========================================================================== -AC_MSG_CHECKING(for SHA512 support) -AC_ARG_ENABLE(sha512, [ --enable-sha512 enable SHA512 support (yes)]) +AC_MSG_CHECKING(for SHA512 support) +AC_ARG_ENABLE([sha512], [AC_HELP_STRING([--enable-sha512], [enable SHA512 support (yes)])]) if test "z$enable_sha512" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SHA512=1" XMLSEC_NO_SHA512="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_SHA512="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_SHA512, test "z$XMLSEC_NO_SHA512" = "z1") AC_SUBST(XMLSEC_NO_SHA512) @@ -1260,96 +1926,96 @@ AC_SUBST(XMLSEC_NO_SHA512) dnl ========================================================================== dnl See do we need HMAC support dnl ========================================================================== -AC_MSG_CHECKING(for HMAC support) -AC_ARG_ENABLE(hmac, [ --enable-hmac enable HMAC support (yes)]) +AC_MSG_CHECKING(for HMAC support) +AC_ARG_ENABLE([hmac], [AC_HELP_STRING([--enable-hmac], [enable HMAC support (yes)])]) if test "z$enable_hmac" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_HMAC=1" XMLSEC_NO_HMAC="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_HMAC="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_HMAC, test "z$XMLSEC_NO_HMAC" = "z1") AC_SUBST(XMLSEC_NO_HMAC) dnl ========================================================================== dnl See do we need DSA support dnl ========================================================================== -AC_MSG_CHECKING(for DSA support) -AC_ARG_ENABLE(dsa, [ --enable-dsa enable DSA support (yes)]) +AC_MSG_CHECKING(for DSA support) +AC_ARG_ENABLE([dsa], [AC_HELP_STRING([--enable-dsa], [enable DSA support (yes)])]) if test "z$enable_dsa" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DSA=1" XMLSEC_NO_DSA="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_DSA="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_DSA, test "z$XMLSEC_NO_DSA" = "z1") AC_SUBST(XMLSEC_NO_DSA) dnl ========================================================================== dnl See do we need RSA support dnl ========================================================================== -AC_MSG_CHECKING(for RSA support) -AC_ARG_ENABLE(rsa, [ --enable-rsa enable RSA support (yes)]) +AC_MSG_CHECKING(for RSA support) +AC_ARG_ENABLE([rsa], [AC_HELP_STRING([--enable-rsa], [enable RSA support (yes)])]) if test "z$enable_rsa" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_RSA=1" XMLSEC_NO_RSA="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_RSA="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_RSA, test "z$XMLSEC_NO_RSA" = "z1") AC_SUBST(XMLSEC_NO_RSA) dnl ========================================================================== dnl See do we need x509 support dnl ========================================================================== -AC_MSG_CHECKING(for x509 support) -AC_ARG_ENABLE(x509, [ --enable-x509 enable x509 support (yes)]) +AC_MSG_CHECKING(for x509 support) +AC_ARG_ENABLE([x509], [AC_HELP_STRING([--enable-x509], [enable x509 support (yes)])]) if test "z$enable_x509" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_X509=1" XMLSEC_NO_X509="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_X509="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_X509, test "z$XMLSEC_NO_X509" = "z1") AC_SUBST(XMLSEC_NO_X509) dnl ========================================================================== dnl See do we need DES support dnl ========================================================================== -AC_MSG_CHECKING(for DES support) -AC_ARG_ENABLE(des, [ --enable-des enable DES support (yes)]) +AC_MSG_CHECKING(for DES support) +AC_ARG_ENABLE([des], [AC_HELP_STRING([--enable-des], [enable DES support (yes)])]) if test "z$enable_des" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_DES=1" XMLSEC_NO_DES="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_DES="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_DES, test "z$XMLSEC_NO_DES" = "z1") AC_SUBST(XMLSEC_NO_DES) dnl ========================================================================== dnl See do we need AES support dnl ========================================================================== -AC_MSG_CHECKING(for AES support) -AC_ARG_ENABLE(aes, [ --enable-aes enable AES support]) +AC_MSG_CHECKING(for AES support) +AC_ARG_ENABLE([aes], [AC_HELP_STRING([--enable-aes], [enable AES support])]) if test "z$enable_aes" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_AES=1" XMLSEC_NO_AES="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_AES="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_AES, test "z$XMLSEC_NO_AES" = "z1") AC_SUBST(XMLSEC_NO_AES) @@ -1357,14 +2023,14 @@ dnl ========================================================================== dnl See do we need GOST support dnl ========================================================================== AC_MSG_CHECKING(for GOST support) -AC_ARG_ENABLE(gost, [ --enable-gost enable GOST support (no)]) +AC_ARG_ENABLE([gost], [AC_HELP_STRING([--enable-gost], [enable GOST support (no)])]) if test "z$enable_gost" != "zyes" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST=1" XMLSEC_NO_GOST="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_GOST="0" - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) fi AM_CONDITIONAL(XMLSEC_NO_GOST, test "z$XMLSEC_NO_GOST" = "z1") AC_SUBST(XMLSEC_NO_GOST) @@ -1374,14 +2040,14 @@ dnl ========================================================================== dnl See do we need GOST2012 support dnl ========================================================================== AC_MSG_CHECKING(for EXPERMIENTAL GOST2012 support) -AC_ARG_ENABLE(gost, [ --enable-gost2012 enable EXPERMIENTAL GOST2012 support (no)]) +AC_ARG_ENABLE([gost2012], [AC_HELP_STRING([--enable-gost2012], [enable EXPERMIENTAL GOST2012 support (no)])]) if test "z$enable_gost2012" != "zyes" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_GOST2012=1" XMLSEC_NO_GOST2012="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_GOST2012="0" - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) fi AM_CONDITIONAL(XMLSEC_NO_GOST2012, test "z$XMLSEC_NO_GOST2012" = "z1") AC_SUBST(XMLSEC_NO_GOST2012) @@ -1390,66 +2056,142 @@ AC_SUBST(XMLSEC_NO_GOST2012) dnl ========================================================================== dnl See do we need XMLDSig support dnl ========================================================================== -AC_MSG_CHECKING(for XMLDSig support) -AC_ARG_ENABLE(xmldsig, [ --enable-xmldsig enable XMLDSig support (yes)]) +AC_MSG_CHECKING(for XMLDSig support) +AC_ARG_ENABLE([xmldsig], [AC_HELP_STRING([--enable-xmldsig], [enable XMLDSig support (yes)])]) if test "z$enable_xmldsig" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLDSIG=1" XMLSEC_NO_XMLDSIG="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_XMLDSIG="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_XMLDSIG, test "z$XMLSEC_NO_XMLDSIG" = "z1") AC_SUBST(XMLSEC_NO_XMLDSIG) dnl ========================================================================== dnl See do we need XMLEnc support dnl ========================================================================== -AC_MSG_CHECKING(for XMLEnc support) -AC_ARG_ENABLE(xmlenc, [ --enable-xmlenc enable XMLEnc support (yes)]) +AC_MSG_CHECKING(for XMLEnc support) +AC_ARG_ENABLE([xmlenc], [AC_HELP_STRING([--enable-xmlenc], [enable XMLEnc support (yes)])]) if test "z$enable_xmlenc" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLENC=1" XMLSEC_NO_XMLENC="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else XMLSEC_NO_XMLENC="0" - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi AM_CONDITIONAL(XMLSEC_NO_XMLENC, test "z$XMLSEC_NO_XMLENC" = "z1") AC_SUBST(XMLSEC_NO_XMLENC) +dnl ========================================================================== +dnl See do we need soap support (deprecated) +dnl ========================================================================== +AC_MSG_CHECKING(for soap support) +AC_ARG_ENABLE([soap], [AC_HELP_STRING([--enable-soap], [enable soap support (no)])]) +if test "z$enable_soap" = "zyes" ; then + XMLSEC_ENABLE_SOAP="1" + AC_MSG_RESULT([yes]) +else + XMLSEC_ENABLE_SOAP="0" + AC_MSG_RESULT([disabled]) +fi +AM_CONDITIONAL(XMLSEC_ENABLE_SOAP, test "z$XMLSEC_ENABLE_SOAP" = "z1") + +dnl ========================================================================== +dnl See do we need mans +dnl ========================================================================== +AC_MSG_CHECKING(for mans) +AC_ARG_ENABLE([mans], [AC_HELP_STRING([--enable-mans], [enable manual pages (yes)])]) +if test "z$enable_mans" = "zno" ; then + XMLSEC_MANS="0" + AC_MSG_RESULT([disabled]) +else + XMLSEC_MANS="1" + AC_MSG_RESULT([yes]) +fi +AM_CONDITIONAL(XMLSEC_MANS, test "z$XMLSEC_MANS" = "z1") +AC_SUBST(XMLSEC_MANS) + +dnl ========================================================================== +dnl See do we need docs +dnl ========================================================================== +AC_MSG_CHECKING(for docs) +AC_ARG_ENABLE([docs], [AC_HELP_STRING([--enable-docs], [enable documentation (yes)])]) +if test "z$enable_docs" = "zno" ; then + XMLSEC_DOCS="0" + AC_MSG_RESULT([disabled]) +else + XMLSEC_DOCS="1" + AC_MSG_RESULT([yes]) +fi +AM_CONDITIONAL(XMLSEC_DOCS, test "z$XMLSEC_DOCS" = "z1") +AC_SUBST(XMLSEC_DOCS) + +dnl ========================================================================== +dnl See if we need apps +dnl ========================================================================== +AC_MSG_CHECKING(for apps) +AC_ARG_ENABLE([apps], [AC_HELP_STRING([--enable-apps], [enable applications (yes)])]) +if test "z$enable_apps" = "zno" ; then + XMLSEC_APPS="0" + AC_MSG_RESULT([disabled]) +else + XMLSEC_APPS="1" + AC_MSG_RESULT([yes]) +fi +AM_CONDITIONAL(XMLSEC_APPS, test "z$XMLSEC_APPS" = "z1") +AC_SUBST(XMLSEC_APPS) + +dnl ========================================================================== +dnl Static linking (implies enable_crypto_dl="no") +dnl ========================================================================== +XMLSEC_STATIC_BINARIES="" +AC_MSG_CHECKING(for static linking) +AC_ARG_ENABLE([static_linking], [AC_HELP_STRING([--enable-static-linking], [enable static linking (no)])]) +if test "z$enable_static_linking" = "zyes" ; then + XMLSEC_STATIC_BINARIES="-static" + XMLSEC_APP_DEFINES="$XMLSEC_APP_DEFINES -DXMLSEC_STATIC=1" + enable_crypto_dl="no" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([disabled]) +fi +AC_SUBST(XMLSEC_STATIC_BINARIES) + dnl ========================================================================== dnl check if we need dynamic loading support dnl ========================================================================== XMLSEC_DL_INCLUDES="" XMLSEC_DL_LIBS="" -AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support) -AC_ARG_ENABLE(crypto_dl, [ --enable-crypto-dl enable dynamic loading support for xmlsec-crypto libraries (yes)]) +AC_ARG_ENABLE([crypto_dl], [AC_HELP_STRING([--enable-crypto-dl], [enable dynamic loading support for xmlsec-crypto libraries (yes)])]) if test "z$enable_crypto_dl" = "zno" ; then + AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support) XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING=1" XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else - AC_CHECK_HEADER([ltdl.h], - [ - XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_DL_LIBLTDL=1" - AC_CHECK_LIB( - [ltdl], - [lt_dlopenext], - [LIBLTDL=-lltdl], - [LIBLTDL=] - )], - [LIBLTDL=] - ) + AC_CHECK_HEADER([ltdl.h], [ + XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_DL_LIBLTDL=1" + AC_CHECK_LIB( + [ltdl], + [lt_dlopenext], + [LIBLTDL=-lltdl], + [LIBLTDL=] + ) + ], [ + LIBLTDL= + ]) + AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support) if test "z$LIBLTDL" != "z" ; then - XMLSEC_DL_INCLUDES="$INCLTDL" - XMLSEC_DL_LIBS="$LIBLTDL" - XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0" - AC_MSG_RESULT(yes) + XMLSEC_DL_INCLUDES="$INCLTDL" + XMLSEC_DL_LIBS="$LIBLTDL" + XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0" + AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([libltdl is required for xmlsec-crypto dynamic loading]) + AC_MSG_ERROR([libltdl is required for xmlsec-crypto dynamic loading]) fi fi AM_CONDITIONAL(XMLSEC_NO_CRYPTO_DYNAMIC_LOADING, test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1") @@ -1460,114 +2202,114 @@ AC_SUBST(XMLSEC_DL_LIBS) dnl ========================================================================== dnl check if we need dynamic loading in the xmlsec apps dnl ========================================================================== -AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support in command line tool) -AC_ARG_ENABLE(apps_crypto_dl, [ --enable-apps-crypto-dl enable dynamic loading support for xmlsec-crypto libraries in xmlsec command line tool (yes)]) +AC_MSG_CHECKING(for xmlsec-crypto dynamic loading support in command line tool) +AC_ARG_ENABLE([apps_crypto_dl], [AC_HELP_STRING([--enable-apps-crypto-dl], [ enable dynamic loading support for xmlsec-crypto libraries in xmlsec command line tool (yes)])]) if test "z$enable_apps_crypto_dl" = "z" ; then enable_apps_crypto_dl="$enable_crypto_dl" fi if test "z$enable_apps_crypto_dl" = "zno" ; then XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) elif test "z$enable_crypto_dl" = "zno" ; then - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) AC_MSG_ERROR(xmlsec-crypto libraries dynamic loading support in xmlsec command line tool is requested but no dynamic loading in xmlsec itself is disabled) else XMLSEC_APP_DEFINES="$XMLSEC_APP_DEFINES -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1" XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING="0" - AC_MSG_RESULT(yes) -fi -AM_CONDITIONAL(XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING, + AC_MSG_RESULT([yes]) +fi +AM_CONDITIONAL(XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING, test "z$XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING" = "z1") AC_SUBST(XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING) dnl ========================================================================== dnl Where do we want to install docs dnl ========================================================================== -AC_MSG_CHECKING(for docs folder) -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) +AC_MSG_CHECKING(for docs folder) +AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs])]) if test "z$with_html_dir" != "z" ; then - XMLSEC_DOCDIR=$with_html_dir + XMLSEC_DOCDIR="$with_html_dir" +elif test "z$htmldir" != "z" ; then + XMLSEC_DOCDIR='$(htmldir)' else XMLSEC_DOCDIR='$(datadir)/doc/xmlsec1' fi -AC_MSG_RESULT($XMLSEC_DOCDIR) +AC_MSG_RESULT([$XMLSEC_DOCDIR]) AC_SUBST(XMLSEC_DOCDIR) dnl ========================================================================== -dnl See do we need Simple Keys Manager +dnl See do we need Simple Keys Manager dnl ========================================================================== -AC_MSG_CHECKING(for Simple Keys Manager testing) -AC_ARG_ENABLE(skm, [ --enable-skm enable Simple Keys Manager testing (yes)]) +AC_MSG_CHECKING(for Simple Keys Manager testing) +AC_ARG_ENABLE([skm], [AC_HELP_STRING([--enable-skm], [enable Simple Keys Manager testing (yes)])]) if test "z$enable_skm" = "zno" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SKM_TEST=1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) fi dnl ========================================================================== dnl See do we need templates tests dnl ========================================================================== -AC_MSG_CHECKING(for templates testing) -AC_ARG_ENABLE(tmpl_tests, [ --enable-tmpl-tests enable templates testing in xmlsec utility (yes)]) +AC_MSG_CHECKING(for templates testing) +AC_ARG_ENABLE([tmpl_tests], [AC_HELP_STRING([--enable-tmpl-tests], [enable templates testing in xmlsec utility (yes)])]) if test "z$enable_tmpl_tests" = "zyes" ; then XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_TMPL_TEST=1" - AC_MSG_RESULT(no) + AC_MSG_RESULT([disabled]) else - AC_MSG_RESULT(yes) -fi + AC_MSG_RESULT([yes]) +fi dnl ========================================================================== -dnl Debug +dnl Debug dnl ========================================================================== AC_MSG_CHECKING(for debugging) -AC_ARG_ENABLE(debugging, [ --enable-debugging enable debugging compilation flags (no)]) +AC_ARG_ENABLE([debugging], [AC_HELP_STRING([--enable-debugging], [enable debugging compilation flags (no)])]) if test "z$enable_debugging" = "zyes" ; then CFLAGS="$CFLAGS -g" - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([disabled]) +fi + +dnl ========================================================================== +dnl Warnings as errors +dnl ========================================================================== +AC_MSG_CHECKING(for warnings as errors) +AC_ARG_ENABLE([werror], [AC_HELP_STRING([--enable-werror], [handle warnings as errors (no)])]) +if test "z$enable_werror" = "zyes" ; then + CFLAGS="$CFLAGS -Werror" + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) -fi + AC_MSG_RESULT([disabled]) +fi dnl ========================================================================== -dnl Profiling +dnl Profiling dnl ========================================================================== -AC_MSG_CHECKING(for profiling) -AC_ARG_ENABLE(profiling, [ --enable-profiling enable profiling compilation flags (no)]) +AC_MSG_CHECKING(for profiling) +AC_ARG_ENABLE([profiling], [AC_HELP_STRING([--enable-profiling], [enable profiling compilation flags (no)])]) if test "z$enable_profiling" = "zyes" ; then CFLAGS="$CFLAGS -pg" - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) -fi + AC_MSG_RESULT([disabled]) +fi dnl ========================================================================== dnl Pedantic compilation dnl ========================================================================== -AC_MSG_CHECKING(for pedantic) -AC_ARG_ENABLE(pedantic, [ --enable-pedantic enable pedantic compilation flags (no)]) +AC_MSG_CHECKING(for pedantic) +AC_ARG_ENABLE([pedantic], [AC_HELP_STRING([--enable-pedantic], [enable pedantic compilation flags (no)])]) if test "z$enable_pedantic" = "zyes" ; then dnl CFLAGS="$CFLAGS -pedantic -Wall -std=c99 -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wredundant-decls" CFLAGS="$CFLAGS -O -pedantic -Wall -std=c99 -fno-inline -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wredundant-decls" - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) -fi - -dnl ========================================================================== -dnl Static linking -dnl ========================================================================== -XMLSEC_STATIC_BINARIES="" -AC_MSG_CHECKING(for static linking) -AC_ARG_ENABLE(static_linking, [ --enable-static-linking enable static linking (no)]) -if test "z$enable_static_linking" = "zyes" ; then - XMLSEC_STATIC_BINARIES="-static" - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AC_SUBST(XMLSEC_STATIC_BINARIES) + AC_MSG_RESULT([disabled]) +fi dnl ========================================================================== dnl Final steps: xmlsec config @@ -1608,6 +2350,12 @@ dnl XMLSEC_MSCRYPTO_LIBS="-L${libdir} -l$MSCRYPTO_CRYPTO_LIB $XMLSEC_CORE_LIBS $ dnl AC_SUBST(XMLSEC_MSCRYPTO_CFLAGS) dnl AC_SUBST(XMLSEC_MSCRYPTO_LIBS) +dnl No we will not generate pkg-config file for mscng. +dnl XMLSEC_MSCNG_CFLAGS="$XMLSEC_CORE_CFLAGS $MSCNG_CFLAGS" +dnl XMLSEC_MSCNG_LIBS="-L${libdir} -l$MSCNG_CRYPTO_LIB $XMLSEC_CORE_LIBS $MSCNG_LIBS";; +dnl AC_SUBST(XMLSEC_MSCNG_CFLAGS) +dnl AC_SUBST(XMLSEC_MSCNG_LIBS) + XMLSEC_CFLAGS="$XMLSEC_CORE_CFLAGS $LIBXML_CFLAGS $LIBXSLT_CFLAGS $XMLSEC_CRYPTO_CFLAGS" XMLSEC_LIBS="-L${libdir} -l$XMLSEC_CRYPTO_LIB $XMLSEC_CORE_LIBS $LIBXML_LIBS $LIBXSLT_LIBS $XMLSEC_CRYPTO_LIBS" AC_SUBST(XMLSEC_CFLAGS) @@ -1630,8 +2378,9 @@ AC_SUBST(XMLSEC_CRYPTO_LIBS) XMLSEC_CRYPTO_PC_FILES_LIST="" for i in $XMLSEC_CRYPTO_LIST ; do - dnl skip pkg-config file for mscrypto + dnl skip pkg-config file for mscrypto/mscng test x$i = xmscrypto && continue + test x$i = xmscng && continue XMLSEC_CRYPTO_PC_FILES_LIST="$XMLSEC_CRYPTO_PC_FILES_LIST $XMLSEC_PACKAGE-$i.pc" done AC_SUBST(XMLSEC_CRYPTO_PC_FILES_LIST) @@ -1659,6 +2408,10 @@ if test "z$XMLSEC_NO_MSCRYPTO" != "z1" ; then AC_CONFIG_FILES([include/xmlsec/mscrypto/Makefile src/mscrypto/Makefile]) fi +if test "z$XMLSEC_NO_MSCNG" != "z1" ; then +AC_CONFIG_FILES([include/xmlsec/mscng/Makefile src/mscng/Makefile]) +fi + if test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1" ; then (rm -f xmlsec1.pc && $LN_S xmlsec1-$XMLSEC_DEFAULT_CRYPTO.pc xmlsec1.pc) else -- cgit v1.2.3