From: Alex Graveley Date: Fri, 2 Mar 2001 09:30:02 +0000 (+0000) Subject: exit nicely if no test URL is supplied. X-Git-Tag: SOUP_0_4_1~127 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=651c0093434f9d913a7a60a2bf2ac2193b3fa2d0;p=platform%2Fupstream%2Flibsoup.git exit nicely if no test URL is supplied. 2001-03-02 Alex Graveley * tests/stress-test.c (main): exit nicely if no test URL is supplied. * tests/simple-test.c (main): use http://www.ximian.com is no test URL is supplied. * tests/Makefile.am (INCLUDES): include glib headers. * src/soup-wsdl/Makefile.am (INCLUDES): include glib, popt, and libxml headers. (soup_wsdl_LDADD): explicitly add glib, popt, libxml deps. * src/soup-core/Makefile.am (INCLUDES): include gnet, libxml, openssl, and nss headers. (libsoup_la_LIBADD): explicitly add gnet, libxml deps. (soup_ssl_proxy_LDADD): explicitly add glib, nss and openssl deps. * soup.spec.in: remove OpenSSL advertising clause. * soupConf.sh.in: list out dependencies (gnet, libxml). * soup.pc.in: list out dependencies (gnet, libxml). * soup-config.in: list out dependencies (gnet, libxml). * configure.in: Cleanups to remove unnecessary dependencies. --- diff --git a/ChangeLog b/ChangeLog index ebb9607..d9dad1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2001-03-02 Alex Graveley + + * tests/stress-test.c (main): exit nicely if no test URL is supplied. + + * tests/simple-test.c (main): use http://www.ximian.com is no test + URL is supplied. + + * tests/Makefile.am (INCLUDES): include glib headers. + + * src/soup-wsdl/Makefile.am (INCLUDES): include glib, popt, and + libxml headers. + (soup_wsdl_LDADD): explicitly add glib, popt, libxml deps. + + * src/soup-core/Makefile.am (INCLUDES): include gnet, libxml, + openssl, and nss headers. + (libsoup_la_LIBADD): explicitly add gnet, libxml deps. + (soup_ssl_proxy_LDADD): explicitly add glib, nss and openssl deps. + + * soup.spec.in: remove OpenSSL advertising clause. + + * soupConf.sh.in: list out dependencies (gnet, libxml). + + * soup.pc.in: list out dependencies (gnet, libxml). + + * soup-config.in: list out dependencies (gnet, libxml). + + * configure.in: Cleanups to remove unnecessary dependencies. + 2001-02-28 Alex Graveley * src/soup-core/soup-ssl.c (soup_ssl_idle_waitpid): glib idle diff --git a/configure.in b/configure.in index 2333fe1..2c5c79c 100644 --- a/configure.in +++ b/configure.in @@ -115,48 +115,57 @@ AM_PROG_LIBTOOL # Check for libraries # Need GLIB -AM_PATH_GLIB(1.2.0, - [LIBS="$LIBS $GLIB_LIBS" CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"], - AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?), - gmodule) +AM_PATH_GLIB(1.2.0,, + AC_MSG_ERROR([Cannot find GLIB: Is glib-config in path?]), + gmodule) -#GLIB_CFLAGS=`glib-config --cflags glib gmodule` -#GLIB_LIBS=`glib-config --libs glib gmodule` +GLIB_CFLAGS=`glib-config --cflags glib gmodule` +GLIB_LIBS=`glib-config --libs glib gmodule` -#AC_SUBST(GLIB_CFLAGS) -#AC_SUBST(GLIB_LIBS) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) # Need GNET -AM_PATH_GNET(1.0.0, - [LIBS="$LIBS $GNET_LIBS" CPPFLAGS="$CPPFLAGS $GNET_CFLAGS"], - AC_MSG_ERROR(Cannot find GNET: Is gnet-config in path?)) +AM_PATH_GNET(1.0.4,, + AC_MSG_ERROR([Cannot find GNET: Is gnet-config in path?])) -#GNET_CFLAGS=`gnet-config --cflags gnet` -#GNET_LIBS=`gnet-config --libs gnet` +GNET_CFLAGS=`gnet-config --cflags gnet` +GNET_LIBS=`gnet-config --libs gnet` -#AC_SUBST(GNET_CFLAGS) -#AC_SUBST(GNET_LIBS) +AC_SUBST(GNET_CFLAGS) +AC_SUBST(GNET_LIBS) # Need gnome-xml 1 AC_PATH_PROG(XML_CONFIG,xml-config,no) if test x$XML_CONFIG = xno; then - AC_MSG_ERROR(Cannot find xml-config) + AC_MSG_ERROR([Cannot find LIBXML: Is xml-config in path?]) fi -XML_LIBS=`xml-config --libs` XML_CFLAGS=`xml-config --cflags` +XML_LIBS=`xml-config --libs` -LIBS="$LIBS $XML_LIBS" -CPPFLAGS="$CPPFLAGS $XML_CFLAGS" - -AC_SUBST(XML_LIBS) AC_SUBST(XML_CFLAGS) +AC_SUBST(XML_LIBS) # Need popt -# FIXME: Remove ubiquitous support, use $POPT_LIBS and $POPT_CFLAGS instead +save_CPPFLAGS=$CPPFLAGS +save_LIBS=$LIBS +CPPFLAGS= +LIBS= + AC_CHECK_LIB(popt, poptGetContext,, AC_MSG_ERROR([popt is required])) +AC_CHECK_HEADERS(popt.h,, AC_MSG_ERROR([popt.h is required])) + +POPT_CFLAGS=$CPPFLAGS +POPT_LIBS=$LIBS + +AC_SUBST(POPT_CFLAGS) +AC_SUBST(POPT_LIBS) + +CPPFLAGS=$save_CPPFLAGS +LIBS=$save_LIBS # Need in.h and tcp.h for setting of TCP_NODELAY @@ -175,7 +184,7 @@ nspr_inc_prefix=-I$withval AC_ARG_WITH(nspr-libs, [ --with-nspr-libs Specify location of Netscape Portable Runtime libs],[ -nspr_prefix=$withval +nspr_prefix=-L$withval ]) AC_ARG_WITH(nss-includes, @@ -185,7 +194,7 @@ nss_inc_prefix=-I$withval AC_ARG_WITH(nss-libs, [ --with-nss-libs Specify location of NSS libs],[ -nss_prefix=$withval +nss_prefix=-L$withval ]) @@ -196,16 +205,30 @@ openssl_inc_prefix=-I$withval AC_ARG_WITH(openssl-libs, [ --with-openssl-libs Specify location of OpenSSL libs],[ -openssl_prefix=$withval +openssl_prefix=-L$withval ]) if test "x$enable_ssl" = xyes; then - CPPFLAGS="$CPPFLAGS $openssl_inc_prefix $nspr_inc_prefix $nss_inc_prefix" + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$openssl_inc_prefix" AC_CHECK_HEADERS(openssl/ssl.h) AC_CHECK_HEADERS(openssl/err.h) + OPENSSL_CFLAGS=$CPPFLAGS + OPENSSL_LIBS="$openssl_prefix" + AC_SUBST(OPENSSL_CFLAGS) + AC_SUBST(OPENSSL_LIBS) + CPPFLAGS=$save_CPPFLAGS + + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$nspr_inc_prefix $nss_inc_prefix" AC_CHECK_HEADERS(prthread.h) AC_CHECK_HEADERS(security/ssl.h) AC_CHECK_HEADERS(security/pk11func.h) + NSS_CFLAGS=$CPPFLAGS + NSS_LIBS="$nspr_prefix $nss_prefix" + AC_SUBST(NSS_CFLAGS) + AC_SUBST(NSS_LIBS) + CPPFLAGS=$save_CPPFLAGS fi # Set PACKAGE_SOURCE_DIR in config.h. diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am index 554964e..19bb274 100644 --- a/libsoup/Makefile.am +++ b/libsoup/Makefile.am @@ -6,7 +6,11 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"SOUP\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DBINDIR=\"$(bindir)\" \ - @SOUP_DEBUG_FLAGS@ + @SOUP_DEBUG_FLAGS@ \ + @GNET_CFLAGS@ \ + @XML_CFLAGS@ \ + @OPENSSL_CFLAGS@ \ + @NSS_CFLAGS@ soupincludedir = $(includedir)/soup @@ -14,6 +18,10 @@ lib_LTLIBRARIES = libsoup.la libsoup_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libsoup_la_LIBADD = \ + $(GNET_LIBS) \ + $(XML_LIBS) + libsoup_la_SOURCES = \ soup-context.c \ soup-headers.h \ @@ -42,6 +50,11 @@ soupinclude_HEADERS = \ bin_PROGRAMS = soup-ssl-proxy +soup_ssl_proxy_LDADD = \ + $(OPENSSL_LIBS) \ + $(NSS_LIBS) \ + $(GLIB_LIBS) + soup_ssl_proxy_SOURCES = \ soup-nss.h \ soup-nss.c \ diff --git a/soup-2.0.pc.in b/soup-2.0.pc.in index 7b1fa31..646d7a8 100644 --- a/soup-2.0.pc.in +++ b/soup-2.0.pc.in @@ -7,5 +7,5 @@ Name: Soup Description: a SOAP client library in C. Version: @VERSION@ Requires: glib, gnet -Libs: -L${libdir} -lsoup @GNET_LIBS@ -Cflags: -I${includedir} @GNET_CFLAGS@ \ No newline at end of file +Libs: -L${libdir} -lsoup @GNET_LIBS@ @XML_LIBS@ +Cflags: -I${includedir} @GNET_CFLAGS@ @XML_CFLAGS@ \ No newline at end of file