diff options
| author | JP Rosevear <jpr@ximian.com> | 2001-03-07 17:21:12 +0000 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2001-03-07 17:21:12 +0000 |
| commit | 385604c36fb2c3190288d182c4bfefc158ec803c (patch) | |
| tree | 8aa20e0d386d8c49235a43bcd0a109bb6682ee8c | |
| parent | 1cb19005d36d848a9635122ed54758b0d4f5cae3 (diff) | |
| download | libsoup-385604c36fb2c3190288d182c4bfefc158ec803c.tar.gz libsoup-385604c36fb2c3190288d182c4bfefc158ec803c.tar.bz2 libsoup-385604c36fb2c3190288d182c4bfefc158ec803c.zip | |
use configure.in vars for subst
2001-03-07 JP Rosevear <jpr@ximian.com>
* soupConf.sh.in: use configure.in vars for subst
* configure.in: create variables for config script
* Makefile.am: generate the soupConf.sh script in the makefile for
proper substitution
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.in | 8 |
3 files changed, 26 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2001-03-07 JP Rosevear <jpr@ximian.com> + + * soupConf.sh.in: use configure.in vars for subst + + * configure.in: create variables for config script + + * Makefile.am: generate the soupConf.sh script in the makefile for + proper substitution + 2001-03-07 Alex Graveley <alex@ximian.com> * src/soup-core/soup-cgi.c: created. moved cgi-related request diff --git a/Makefile.am b/Makefile.am index 8abb0658..d13b1572 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,14 @@ EXTRA_DIST = autogen.sh soupConf.sh.in soup.pc.in soup.spec.in bin_SCRIPTS = soup-config +soupConf.sh: $(top_srcdir)/soupConf.sh.in Makefile + sed -e 's?\@SOUP_LIBDIR\@?$(SOUP_LIBDIR)?g' \ + -e 's?\@SOUP_INCLUDEDIR\@?$(SOUP_INCLUDEDIR)?g' \ + -e 's?\@VERSION\@?$(VERSION)?g' \ + -e 's?\@SOUP_LIBS\@?$(SOUP_LIBS)?g' \ + < $(top_srcdir)/soupConf.sh.in > soupConf.tmp \ + && mv soupConf.tmp soupConf.sh + confexecdir = $(libdir) confexec_DATA = soupConf.sh @@ -17,3 +25,5 @@ dist-hook: soup.spec rpms: distcheck rpm -ta $(top_builddir)/@PACKAGE@-@VERSION@.tar.gz + +CLEANFILES = soupConf.sh diff --git a/configure.in b/configure.in index e11d32d0..508f9182 100644 --- a/configure.in +++ b/configure.in @@ -113,6 +113,13 @@ AC_SUBST(POPT_LIBS) CPPFLAGS=$save_CPPFLAGS LIBS=$save_LIBS +# For proper var substitution in soupConf.sh +SOUP_LIBDIR='-L${libdir}' +SOUP_INCLUDEDIR=" -I${includedir} $GNET_CFLAGS $XML_CFLAGS" +SOUP_LIBS="-lsoup $GNET_LIBS $XML_LIBS" +AC_SUBST(SOUP_LIBDIR) +AC_SUBST(SOUP_INCLUDEDIR) +AC_SUBST(SOUP_LIBS) # Need in.h and tcp.h for setting of TCP_NODELAY AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h) @@ -222,7 +229,6 @@ AC_OUTPUT([ soup-config soup.pc soup.spec - soupConf.sh Makefile src/Makefile src/soup-core/Makefile |