Fixed bug #172: RPM builds does not enable SSL.
[yaz-moved-to-github.git] / configure.in
index 2a82368..9062693 100644 (file)
@@ -1,8 +1,8 @@
-dnl YAZ Toolkit, Index Data 1994-2003
+dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.113 2003-05-26 20:09:01 adam Exp $
+dnl $Id: configure.in,v 1.157 2004-10-09 08:03:26 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.2)
+AM_INIT_AUTOMAKE(yaz, 2.0.26)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -15,75 +15,9 @@ test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
 AC_PROG_INSTALL
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
+AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
 dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbookx.dtd)
-   for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
-         /usr/share/sgml/docbook/xml-dtd-4.1.2* \
-         /usr/share/sgml/docbook/xml-dtd-4.1 \
-         /usr/share/sgml/docbook/dtd/xml/4.0 \
-           /usr/lib/sgml/dtd/docbook-xml 
-   do
-     if test -f $d/docbookx.dtd; then
-       AC_MSG_RESULT($d)
-       DTD_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DTD_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      use Docbook DSSSL in DIR/{html,print}/docbook.dsl],
-[
-   if test -f "$withval/html/docbook.dsl"; then
-      DSSSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbook.dsl)
-   for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
-            /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
-   do
-     if test -f $d/html/docbook.dsl; then
-       AC_MSG_RESULT($d)
-       DSSSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DSSSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(XSL_DIR)
-AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        use Docbook XSL in DIR/{htmlhelp,xhtml}],
-[
-   if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
-      XSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for htmlhelp.xsl)
-   for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
-            /usr/share/sgml/docbook/xsl-stylesheets-1.* 
-   do
-     if test -f $d/htmlhelp/htmlhelp.xsl; then
-       AC_MSG_RESULT($d)
-       XSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$XSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
+YAZ_DOC
 dnl 
 dnl ----- Sockets
 checkBoth=0
@@ -99,37 +33,61 @@ fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ OpenSSL
-openssl=no
-AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
 AC_SUBST(SSL_CFLAGS)
-AC_SUBST(SSL_LIBS)
-AC_SUBST(SSL_DEFS)
-USE_SSL=0
+openssl=no
+AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
 SSL_CFLAGS=""
-SSL_LIBS=""
-SSL_DEFS=""
+SSL_LIBPATH=""
 if test "$openssl" != "no"; then
-       xLIBS="$LIBS";
-       xCFLAGS="$CFLAGS";
+       sslver=no
        if test "$openssl" != "yes"; then
-                SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
-                SSL_LIBS="-L$openssl/lib"
-               CFLAGS="$SSL_CFLAGS $CFLAGS"
-               LIBS="$SSL_LIBS $LIBS"
+               if test -x $openssl/bin/pkg-config; then
+                       if $openssl/bin/pkg-config --exists openssl; then
+                               SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
+                               LIBS="$LIBS `$openssl/bin/pkg-config --libs openssl`"
+                               sslver=`$openssl/bin/pkg-config --modversion openssl`
+                       fi
+               fi
+               if test "$sslver" = "no"; then
+                       SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
+                       SSL_LIBPATH="-L$openssl/lib"
+               fi
+       else
+               if test "$pkgconfigpath" != "NONE"; then
+                       if $pkgconfigpath --exists openssl; then
+                               SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
+                               LIBS="$LIBS `$pkgconfigpath --libs openssl`"
+                               sslver=`$pkgconfigpath --modversion openssl`
+                       fi
+               fi
+               if test "$sslver" = "no"; then
+                       SSL_CFLAGS="-I/usr/include/openssl"
+               fi
        fi
-       AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
-        LIBS="$LIBS $SSL_LIBS"
-       AC_CHECK_LIB(ssl, SSL_new)
-       if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
-                SSL_LIBS="$SSL_LIBS -lssl"
-               AC_CHECK_HEADER(openssl/ssl.h,[SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"; USE_SSL=1])
-        else
-                SSL_LIBS=""
+       if test "$sslver" = "no"; then
+               xLIBS="$LIBS";
+               xCPPFLAGS="$CPPFLAGS";
+               CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
+               AC_CHECK_LIB(crypto, main)
+               AC_CHECK_LIB(ssl, SSL_new)
+               if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
+                       AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
+                       LIBS="$SSL_LIBPATH $LIBS"
+               fi
+               if test "$sslver" != "yes"; then
+                       LIBS="$xLIBS"
+               fi
+               CPPFLAGS="$xCPPFLAGS"
+       fi
+       AC_MSG_CHECKING([for SSL])
+       if test "$sslver" != "no"; then
+               SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+               AC_MSG_RESULT([$sslver])
+       else
+               SSL_CFLAGS=""
+               AC_MSG_RESULT([None])
        fi
-       LIBS="$xLIBS"
-       CFLAGS="$xCFLAGS"
 fi
-AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
 dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
@@ -147,24 +105,18 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
        #include <stdio.h>
        #include <readline/readline.h>
        ],[
-        static void f()
-        {
                 rl_attempted_completion_over = 0;
-        }
         ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
         AC_TRY_LINK([
        #include <stdio.h>
        #include <readline/readline.h>
        ],[
-        static void f()
-        {
                 rl_completion_matches (0, 0);
-        }
-        ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
+        ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
         LIBS=$xLIBS
 fi
 dnl ------ iconv
-AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]   iconv library in PREFIX])
+AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]     iconv library in PREFIX])
 if test "$with_iconv" != "no"; then
         AC_MSG_CHECKING(for iconv)
        oldLIBS="$LIBS"
@@ -176,7 +128,7 @@ if test "$with_iconv" != "no"; then
         AC_TRY_LINK([
                #include <iconv.h>
        ],[
-               static void f() {iconv_t t = iconv_open("", ""); }
+               iconv_t t = iconv_open("", "");
        ],[
                AC_DEFINE(HAVE_ICONV_H)
                AC_MSG_RESULT(yes)
@@ -185,7 +137,7 @@ if test "$with_iconv" != "no"; then
                AC_TRY_LINK([
                        #include <iconv.h>
                ],[
-                       static void f() {iconv_t t = iconv_open("", ""); }
+                       iconv_t t = iconv_open("", "");
                ],[
                        AC_DEFINE(HAVE_ICONV_H)
                        AC_MSG_RESULT(yes)
@@ -253,7 +205,7 @@ AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
-if test "$enable_tcpd" != ""; then
+if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
        oldLibs=$LIBS
        oldCPPFLAGS=$CPPFLAGS
        if test "$enable_tcpd" != "yes"; then
@@ -271,6 +223,7 @@ if test "$enable_tcpd" != ""; then
        tcpd_ok=1, tcpd_ok=0)
        if test "$tcpd_ok" = "0"; then
                AC_MSG_RESULT(no)
+               AC_MSG_ERROR([tcpd development libraries missing])
                LIBS=$oldLibs
                CPPFLAGS=$oldCPPFLAGS
        else
@@ -353,9 +306,9 @@ dnl
 dnl ----- libXML2
 AC_SUBST(XML2_LIBS)
 AC_SUBST(XML2_CFLAGS)
-xml2dir=yes
-AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]    use libxml2 in PREFIX],[xml2dir=$withval])
-if test "$xml2dir" = "yes"; then
+xml2dir=default
+AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]      use libxml2 in PREFIX],[xml2dir=$withval])
+if test "$xml2dir" = "yes" -o "$xml2dir" = "default"; then
        for d in /usr /usr/local; do
                if test -x $d/bin/xml2-config; then
                        xml2dir=$d
@@ -372,7 +325,10 @@ if test "$xml2dir" != "no"; then
                AC_MSG_RESULT($XML2_VER)
                AC_DEFINE(HAVE_XML2)
        else
-               AC_MSG_RESULT(Not found)
+               AC_MSG_RESULT([Not found])
+               if test "$xml2dir" != "default"; then
+                       AC_MSG_ERROR([libXML2 development libraries missing])
+               fi
        fi
 fi
 dnl
@@ -395,18 +351,11 @@ dnl
 AC_OUTPUT([
 Makefile
 yaz.spec
+src/Makefile
+test/Makefile
 util/Makefile
-odr/Makefile
-z39.50/Makefile
-ill/Makefile
-zutil/Makefile
-comstack/Makefile
-ccl/Makefile
-cql/Makefile
-server/Makefile
 include/Makefile
 include/yaz/Makefile
-lib/Makefile
 client/Makefile
 ztest/Makefile
 zoom/Makefile
@@ -419,4 +368,5 @@ doc/tkl.xsl
 doc/yazhtml.xsl
 etc/Makefile
 yaz-config
-],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > lib/yaz-config && chmod +x yaz-config lib/yaz-config])
+Doxyfile
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])