From 7a47bd6164a6d1806af7557daedb2be5db064140 Mon Sep 17 00:00:00 2001 From: m0gg Date: Mon, 6 Mar 2006 13:28:21 +0000 Subject: Buildsystem cleanup --- configure.ac | 259 ++++++++++------------------------------------------------- 1 file changed, 41 insertions(+), 218 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5ad6b14..95f26ad 100644 --- a/configure.ac +++ b/configure.ac @@ -1,98 +1,34 @@ -dnl -------------------------------- -dnl Initialization macros. -dnl -------------------------------- - -AC_INIT(libcsoap/soap-xml.h) -AM_CONFIG_HEADER(config.h) - -dnl ----------------------------------------------- -dnl Package name and version number (user defined) -dnl ----------------------------------------------- - -GENERIC_LIBRARY_NAME=libcsoap - -#release versioning -GENERIC_MAJOR_VERSION=1 -GENERIC_MINOR_VERSION=0 -GENERIC_MICRO_VERSION=4 - -#API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION) -GENERIC_API_VERSION=1.0 -AC_SUBST(GENERIC_API_VERSION) - -#shared library versioning -GENERIC_LIBRARY_VERSION=1:0:0 -# | | | -# +------+ | +---+ -# | | | -# current:revision:age -# | | | -# | | +- increment if interfaces have been added -# | | set to zero if interfaces have been removed -# or changed -# | +- increment if source code has changed -# | set to zero if current is incremented -# +- increment if interfaces have been added, removed or changed - - -NANOHTTP_LIBRARY_NAME=nanohttp -#release versioning -NANOHTTP_MAJOR_VERSION=1 -NANOHTTP_MINOR_VERSION=0 -NANOHTTP_MICRO_VERSION=4 - -#API version (often = GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION) -NANOHTTP_API_VERSION=1.0 -AC_SUBST(NANOHTTP_API_VERSION) - -#shared library versioning -NANOHTTP_LIBRARY_VERSION=1:0:0 - -dnl -------------------------------- -dnl Package name and version number -dnl -------------------------------- - -AC_SUBST(GENERIC_LIBRARY_VERSION) - -PACKAGE=$GENERIC_LIBRARY_NAME -AC_SUBST(GENERIC_LIBRARY_NAME) - -GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION -GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION -AC_SUBST(GENERIC_RELEASE) -AC_SUBST(GENERIC_VERSION) - -VERSION=$GENERIC_VERSION - -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) - - - -dnl -------------------------------- -dnl Package name and version number (nanohttp) -dnl -------------------------------- +dnl +dnl release information +dnl +AC_INIT(csoap, 1.1.0) -AC_SUBST(NANOHTTP_LIBRARY_VERSION) +dnl +dnl version information +dnl +csoap_version=1:1:0 +nanohttp_version=1:1:0 -PACKAGE=$NANOHTTP_LIBRARY_NAME -AC_SUBST(NANOHTTP_LIBRARY_NAME) +AC_CONFIG_SRCDIR([nanohttp/nanohttp-server.c]) +AC_CONFIG_SRCDIR([libcsoap/soap-server.c]) +AM_INIT_AUTOMAKE -NANOHTTP_VERSION=$NANOHTTP_MAJOR_VERSION.$NANOHTTP_MINOR_VERSION.$NANOHTTP_MICRO_VERSION -NANOHTTP_RELEASE=$NANOHTTP_MAJOR_VERSION.$NANOHTTP_MINOR_VERSION -AC_SUBST(NANOHTTP_RELEASE) -AC_SUBST(NANOHTTP_VERSION) +csoap_release=AC_PACKAGE_VERSION +AC_SUBST(csoap_release) +AC_SUBST(csoap_version) +csoap_version_dotted=`echo $csoap_version | sed 's/:/./g'` +AC_SUBST(csoap_version_dotted) +nanohttp_release=AC_PACKAGE_VERSION +AC_SUBST(nanohttp_release) +AC_SUBST(nanohttp_version) -# Process this file with autoconf to produce a configure script. -#AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) -#AC_INIT(src/csoap.c) -# AC_CONFIG_SRCDIR([csoap.c]) +AM_CONFIG_HEADER(config.h) -# Checks for programs. +AC_LANG_C AC_PROG_CC -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL -# Checks for header files. AC_HEADER_STDC AC_HEADER_TIME AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h signal.h pthread.h string.h sys/socket.h sys/time.h unistd.h io.h stdio.h stdarg.h errno.h ctype.h openssl/rand.h openssl/err.h]) @@ -110,19 +46,29 @@ AC_FUNC_MALLOC AC_FUNC_VPRINTF AC_FUNC_STRFTIME AC_FUNC_SELECT_ARGTYPES -AC_CHECK_FUNCS([gethostbyname inet_ntoa localtime_r memmove memset mkdir select socket strchr strdup strncasecmp strpbrk strspn strstr strtol]) +AC_CHECK_FUNCS([gethostbyname inet_ntoa memmove memset mkdir select socket strchr strdup strncasecmp strpbrk strspn strstr strtol]) + +if test x_$build_os = x_solaris2.8; then + CFLAGS="$CFLAGS -D_REENTRANT" +fi + +AC_CHECK_FUNCS([localtime_r strtok_r]) # ------------------------------------------ -dnl Check socket library (for Solaris) +# Check socket library (for Solaris) # ------------------------------------------ AC_CHECK_LIB(socket, socket, [LIBSOCKET="-lsocket"]) AC_SUBST(LIBSOCKET) + +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) + # ------------------------------------------ -dnl Check ssl library -dnl Original work at: http://autoconf-archive.cryp.to/check_ssl.html +# Check ssl library +# Original work at: http://autoconf-archive.cryp.to/check_ssl.html # ------------------------------------------ AC_DEFUN([CHECK_SSL], [AC_MSG_CHECKING(if ssl is wanted) @@ -135,14 +81,12 @@ AC_ARG_WITH(ssl, ssldir="$dir" if test -f "$dir/include/openssl/ssl.h"; then found_ssl="yes"; - CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; - CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; + CFLAGS="$CFLAGS -I$ssldir/include/openssl"; break; fi if test -f "$dir/include/ssl.h"; then found_ssl="yes"; - CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL"; - CXXFLAGS="$CXXFLAGS -I$ssldir/include/ -DHAVE_SSL"; + CFLAGS="$CFLAGS -I$ssldir/include"; break fi done @@ -154,9 +98,8 @@ AC_ARG_WITH(ssl, printf "OpenSSL found in $ssldir\n"; LIBS="$LIBS -lssl -lcrypto"; LDFLAGS="$LDFLAGS -L$ssldir/lib"; - HAVE_SSL=yes + AC_DEFINE(HAVE_SSL,1,Define to 1 if you have requested --with-ssl) fi - AC_SUBST(HAVE_SSL) ], [ AC_MSG_RESULT(no) @@ -165,132 +108,12 @@ AC_ARG_WITH(ssl, CHECK_SSL -dnl -dnl The following new parameters were added to offer -dnl the ability to specify the location of the libxml -dnl library during linking and compilation. -dnl -dnl original work - Mathieu Lacage 30/03/2000 -dnl - -LIBXML_CONFIG_PREFIX="" -LIBXML_SRC="" - -AC_ARG_WITH(libxml-prefix, - [ --with-libxml-prefix=[PFX] Specify location of libxml config], - LIBXML_CONFIG_PREFIX=$withval -) - -AC_ARG_WITH(libxml-include-prefix, - [ --with-libxml-include-prefix=[PFX] Specify location of libxml headers], - LIBXML_CFLAGS="-I$withval" -) - -AC_ARG_WITH(libxml-libs-prefix, - [ --with-libxml-libs-prefix=[PFX] Specify location of libxml libs], - LIBXML_LIBS="-L$withval" -) - -AC_ARG_WITH(libxml-src, - [ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)], - LIBXML_SRC="$withval" -) - -dnl -dnl where is xml2-config -dnl - -AC_SUBST(LIBXML_REQUIRED_VERSION) -AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) -if test "x$LIBXML_CONFIG_PREFIX" != "x" -then - XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config -else - XML_CONFIG=xml2-config -fi - -dnl -dnl imported from libxml2, c.f. #77827 -dnl -if test "${GCC}" != "yes" ; then - case "${host}" in - *-*-hpux* ) - CFLAGS="${CFLAGS} -Wp,-H30000" - ;; - *-dec-osf* ) - CFLAGS="${CFLAGS} -ieee" - ;; - esac -else - CFLAGS="${CFLAGS} -Wall" - case "${host}" in - alpha*-*-linux* ) - CFLAGS="${CFLAGS} -mieee" - ;; - alpha*-*-osf* ) - CFLAGS="${CFLAGS} -mieee" - ;; - esac -fi - -dnl -dnl Override other variables if LIBXML_SRC is set -dnl - -if test "x$LIBXML_SRC" != "x" -then - CWD=`pwd` - if cd $LIBXML_SRC - then - SRC_DIR=`pwd` - XML_CONFIG=${SRC_DIR}/xml2-config - LIBXML_CFLAGS="-I${SRC_DIR}/include" - LIBXML_LIBS="-L${SRC_DIR}" - cd $CWD - else - AC_MSG_ERROR([libxml source dir not found (${LIBXML_SRC}), typo?]) - fi -fi - -dnl -dnl make sure xml2-config is executable, -dnl test version and init our variables -dnl - -AC_DEFUN([VERSION_TO_NUMBER], -[`$1 | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`]) -if ${XML_CONFIG} --libs print > /dev/null 2>&1 -then - XMLVERS=`$XML_CONFIG --version` - if test VERSION_TO_NUMBER(echo $XMLVERS) -ge VERSION_TO_NUMBER(echo $LIBXML_REQUIRED_VERSION) - then - LIBXML_LIBS="$LIBXML_LIBS `$XML_CONFIG --libs`" - LIBXML_CFLAGS="$LIBXML_CFLAGS `$XML_CONFIG --cflags`" - AC_MSG_RESULT($XMLVERS found) - else - AC_MSG_ERROR(Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt) - fi -else - AC_MSG_ERROR([Could not find libxml2 anywhere, check ftp://xmlsoft.org/.]) -fi - -AC_SUBST(XML_CONFIG) -AC_SUBST(LIBXML_LIBS) -AC_SUBST(LIBXML_CFLAGS) - -AC_SUBST(CFLAGS) -#dnl AC_SUBST(CPPFLAGS) -AC_SUBST(LDFLAGS) - - -#AC_CONFIG_FILES([]) AC_OUTPUT(Makefile libcsoap/Makefile nanohttp/Makefile -xsd2c/Makefile -wsdl2c/Makefile examples/Makefile examples/nanohttp/Makefile examples/csoap/Makefile libcsoap.pc csoap-config) + -- cgit v1.1-32-gdbae