diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.in | 16 |
4 files changed, 34 insertions, 5 deletions
@@ -17,6 +17,7 @@ soup.spec soup-config soupConf.sh soup_apacheConf.sh +soup_wsdlConf.sh stamp-h stamp.h stamp-h.in @@ -1,3 +1,15 @@ +2001-04-25 JP Rosevear <jpr@ximian.com> + + * soup-config.in (lib_soup): get this script working again and add + wsdl + + * Makefile.am: create and install new script + + * configure.in: create variables for script substitution + + * soup_wsdlConf.sh.in: gnome-config script for wsdl compilation + info + 2001-04-23 Rodrigo Moya <rodrigo@ximian.com> * src/soup-wsdl/wsdl-soap-headers.c diff --git a/Makefile.am b/Makefile.am index fa83da90..524325f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,8 +22,16 @@ soup_apacheConf.sh: $(top_srcdir)/soup_apacheConf.sh.in Makefile < $(top_srcdir)/soup_apacheConf.sh.in > soup_apacheConf.tmp \ && mv soup_apacheConf.tmp soup_apacheConf.sh +soup_wsdlConf.sh: $(top_srcdir)/soup_wsdlConf.sh.in Makefile + sed -e 's?\@SOUP_WSDL_LIBDIR\@?$(SOUP_WSDL_LIBDIR)?g' \ + -e 's?\@SOUP_WSDL_INCLUDEDIR\@?$(SOUP_WSDL_INCLUDEDIR)?g' \ + -e 's?\@VERSION\@?$(VERSION)?g' \ + -e 's?\@SOUP_WSDL_LIBS\@?$(SOUP_WSDL_LIBS)?g' \ + < $(top_srcdir)/soup_wsdlConf.sh.in > soup_wsdlConf.tmp \ + && mv soup_wsdlConf.tmp soup_wsdlConf.sh + confexecdir = $(libdir) -confexec_DATA = soupConf.sh soup_apacheConf.sh +confexec_DATA = soupConf.sh soup_apacheConf.sh soup_wsdlConf.sh pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = soup.pc diff --git a/configure.in b/configure.in index ab1499c5..35ab7207 100644 --- a/configure.in +++ b/configure.in @@ -104,21 +104,29 @@ LIBS=$save_LIBS # For proper var substitution in soupConf.sh and soup-apacheConf.sh SOUP_LIBDIR='-L${libdir}' -SOUP_INCLUDEDIR=" -I${includedir} $XML_CFLAGS" -SOUP_LIBS="-lsoup $XML_LIBS" +SOUP_INCLUDEDIR=" -I${includedir} $GLIB_CFLAGS $XML_CFLAGS" +SOUP_LIBS="-lsoup $GLIB_LIBS $XML_LIBS" AC_SUBST(SOUP_LIBDIR) AC_SUBST(SOUP_INCLUDEDIR) AC_SUBST(SOUP_LIBS) SOUP_APACHE_LIBDIR='-L${libdir}' -SOUP_APACHE_INCLUDEDIR=" -I${includedir} $APACHE_CFLAGS $XML_CFLAGS" -SOUP_APACHE_LIBS="-lsoup -lsoup-apache $APACHE_LIBS $XML_LIBS" +SOUP_APACHE_INCLUDEDIR="$SOUP_INCLUDEDIR $APACHE_CFLAGS" +SOUP_APACHE_LIBS="$SOUP_LIBS -lsoup-apache $APACHE_LIBS" AC_SUBST(SOUP_APACHE_LIBDIR) AC_SUBST(SOUP_APACHE_INCLUDEDIR) AC_SUBST(SOUP_APACHE_LIBS) +SOUP_WSDL_LIBDIR='-L${libdir}' +SOUP_WSDL_INCLUDEDIR=" -I${includedir} $GLIB_CFLAGS $XML_CFLAGS" +SOUP_WSDL_LIBS="-lwsdl $GLIB_LIBS $XML_LIBS" + +AC_SUBST(SOUP_WSDL_LIBDIR) +AC_SUBST(SOUP_WSDL_INCLUDEDIR) +AC_SUBST(SOUP_WSDL_LIBS) + # Networking needs |