diff options
author | m0gg | 2006-11-27 12:47:27 +0000 |
---|---|---|
committer | m0gg | 2006-11-27 12:47:27 +0000 |
commit | 17d9b98c8525c74cd83a421f151062825fe66890 (patch) | |
tree | 615dc9207798af270a8a0d957e427cc59a29166c /configure.ac | |
parent | 504da9682a1e739b41cfdbb25721f518c83ebf83 (diff) | |
download | csoap-17d9b98c8525c74cd83a421f151062825fe66890.tar.gz csoap-17d9b98c8525c74cd83a421f151062825fe66890.tar.bz2 |
Code cleanup
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index be4e69d..d52370c 100644 --- a/configure.ac +++ b/configure.ac @@ -330,13 +330,18 @@ AC_CHECK_LIB(nsl, inet_ntoa, [LIBNSL="-lnsl"]) AC_CHECK_LIB(nsl, gethostbyname, [LIBNSL="-lnsl"]) AC_SUBST(LIBNSL) -AM_PATH_XML2(2.6.0,CFLAGS="$CFLAGS $XML_CPPFLAGS"; LDFLAGS="$LDFLAGS $XML_LIBS",exit 1) +AM_PATH_XML2(2.6.0, + CFLAGS="$CFLAGS $XML_CPPFLAGS"; + LDFLAGS="$LDFLAGS $XML_LIBS" +, + exit 1 +) # ------------------------------------------ # Check ssl library # Original work at: http://autoconf-archive.cryp.to/check_ssl.html # ------------------------------------------ -AC_DEFUN([CHECK_SSL], +AC_DEFUN([AM_PATH_SSL], [AC_MSG_CHECKING(if ssl is wanted) AC_ARG_WITH(ssl, [ --with-ssl=PFX will check PFX for ssl library @@ -364,15 +369,21 @@ AC_ARG_WITH(ssl, printf "OpenSSL found in $ssldir\n"; LIBS="$LIBS -lssl -lcrypto"; LDFLAGS="$LDFLAGS -L$ssldir/lib"; - AC_DEFINE(HAVE_SSL,1,Define to 1 if you have requested --with-ssl) + ifelse([$2], , :, [$2]) fi ], [ AC_MSG_RESULT(no) + ifelse([$3], , :, [$3]) ]) ])dnl -CHECK_SSL +AM_PATH_SSL(, + AC_DEFINE(HAVE_SSL,1,Define to 1 if you have requested --with-ssl) + AM_CONDITIONAL(BUILD_WITH_SSL, true) +, + AM_CONDITIONAL(BUILD_WITH_SSL, false) +) #--------------------------------------------- # Check xmlsec1 library |