remove -release tag so libsoup is named libsoup.so.0.1.9 not

2001-02-20  Alex Graveley  <alex@ximian.com>

	* src/soup-core/Makefile.am (libsoup_la_LDFLAGS): remove -release
	tag so libsoup is named libsoup.so.0.1.9 not libsoup-0.1.9.so.0.0.0

	* soupConf.sh.in (SOUP_INCLUDEDIR): use $CPPFLAGS instead of $CFLAGS.

	* soup-config.in (depend_cflags): use $CPPFLAGS instead of $CFLAGS.

	* configure.in: Clean up to use $CPPFLAGS instead of $CFLAGS for
	storing glib, gnet, libxml, openssl, nspr, and nss header
	locations.

diff --git a/ChangeLog b/ChangeLog
index f43ec1c..a356eb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2001-02-20  Alex Graveley  <alex@ximian.com>
 
+       * src/soup-core/Makefile.am (libsoup_la_LDFLAGS): remove -release
+       tag so libsoup is named libsoup.so.0.1.9 not libsoup-0.1.9.so.0.0.0
+
+       * soupConf.sh.in (SOUP_INCLUDEDIR): use $CPPFLAGS instead of $CFLAGS.
+
+       * soup-config.in (depend_cflags): use $CPPFLAGS instead of $CFLAGS.
+
+       * configure.in: Clean up to use $CPPFLAGS instead of $CFLAGS for
+       storing glib, gnet, libxml, openssl, nspr, and nss header
+       locations. 
+
+2001-02-20  Alex Graveley  <alex@ximian.com>
+
        * configure.in: cleaned up to no longer link with an SSL
        library. Added options --with-nspr-includes, --with-nspr-libs,
        --with-nss-includes, --with-nss-libs, --with-openssl-includes, and

diff --git a/configure.in b/configure.in
index b4a788a..153bbd4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,24 +13,24 @@ SOUP_MICRO_VERSION=9
 SOUP_INTERFACE_AGE=0
 SOUP_BINARY_AGE=0
 SOUP_VERSION=$SOUP_MAJOR_VERSION.$SOUP_MINOR_VERSION.$SOUP_MICRO_VERSION
-VERSION=$SOUP_VERSION
-PACKAGE=soup
-AC_DIVERT_POP()
-
-LT_RELEASE=$SOUP_VERSION
-LT_CURRENT=$SOUP_INTERFACE_AGE
-LT_REVISION=$SOUP_BINARY_AGE
-LT_AGE=`expr $SOUP_BINARY_AGE - $SOUP_INTERFACE_AGE`
-
 AC_SUBST(SOUP_MAJOR_VERSION)
 AC_SUBST(SOUP_MINOR_VERSION)
 AC_SUBST(SOUP_MICRO_VERSION)
 AC_SUBST(SOUP_VERSION)
+AC_DIVERT_POP()
+
+LT_RELEASE=$SOUP_VERSION
+LT_CURRENT=$SOUP_MINOR_VERSION
+LT_REVISION=$SOUP_MICRO_VERSION
+LT_AGE=$SOUP_MINOR_VERSION
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
+VERSION=$SOUP_VERSION
+PACKAGE=soup
+
 # Specify a configuration file
 AM_CONFIG_HEADER(config.h)
 
@@ -116,7 +116,7 @@ AM_PROG_LIBTOOL
 
 # Need GLIB
 AM_PATH_GLIB(1.2.0,
-            [LIBS="$LIBS $GLIB_LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS"],
+            [LIBS="$LIBS $GLIB_LIBS" CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"],
             AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?),
             gmodule)
 
@@ -129,7 +129,7 @@ AM_PATH_GLIB(1.2.0,
 
 # Need GNET
 AM_PATH_GNET(1.0.0,
-            [LIBS="$LIBS $GNET_LIBS" CFLAGS="$CFLAGS $GNET_CFLAGS"],
+            [LIBS="$LIBS $GNET_LIBS" CPPFLAGS="$CPPFLAGS $GNET_CFLAGS"],
              AC_MSG_ERROR(Cannot find GNET: Is gnet-config in path?))
 
 #GNET_CFLAGS=`gnet-config --cflags gnet`
@@ -148,7 +148,7 @@ XML_LIBS=`xml-config --libs`
 XML_CFLAGS=`xml-config --cflags`
 
 LIBS="$LIBS $XML_LIBS"
-CFLAGS="$CFLAGS $XML_CFLAGS"
+CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
 
 AC_SUBST(XML_LIBS)
 AC_SUBST(XML_CFLAGS)
@@ -170,8 +170,7 @@ AC_ARG_ENABLE(ssl,
 
 AC_ARG_WITH(nspr-includes,
 [  --with-nspr-includes     Specify location of Netscape Portable Runtime headers],[
-CFLAGS="$CFLAGS -I$withval"
-nspr_inc_prefix=$withval
+nspr_inc_prefix=-I$withval
 ])
 
 AC_ARG_WITH(nspr-libs,
@@ -181,8 +180,7 @@ nspr_prefix=$withval
 
 AC_ARG_WITH(nss-includes,
 [  --with-nss-includes      Specify location of NSS header files],[
-CFLAGS="$CFLAGS -I$withval"
-nss_inc_prefix=$withval
+nss_inc_prefix=-I$withval
 ])
 
 AC_ARG_WITH(nss-libs,
@@ -193,8 +191,7 @@ nss_prefix=$withval
 
 AC_ARG_WITH(openssl-includes,
 [  --with-openssl-includes  Specify location of OpenSSL header files],[
-CFLAGS="$CFLAGS -I$withval"
-openssl_inc_prefix=$withval
+openssl_inc_prefix=-I$withval
 ])
 
 AC_ARG_WITH(openssl-libs,
@@ -203,14 +200,12 @@ openssl_prefix=$withval
 ])
 
 if test "x$enable_ssl" = xyes; then
-       save_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS -I$openssl_inc_prefix -I$nspr_inc_prefix -I$nss_inc_prefix"
+       CPPFLAGS="$CPPFLAGS $openssl_inc_prefix $nspr_inc_prefix $nss_inc_prefix"
        AC_CHECK_HEADERS(openssl/ssl.h)
        AC_CHECK_HEADERS(openssl/err.h)
-       AC_CHECK_HEADERS(prtypes.h)
+       AC_CHECK_HEADERS(prthread.h)
        AC_CHECK_HEADERS(security/ssl.h)
        AC_CHECK_HEADERS(security/pk11func.h)
-       CPPFLAGS="$save_CPPFLAGS"
 fi
 
 # Set PACKAGE_SOURCE_DIR in config.h.
@@ -219,7 +214,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
 
 # If gcc is the compiler, compile with lots of warnings
 if test "x$GCC" = "xyes"; then
-       CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations "
+       CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations "
 fi
 
 #      doc/Makefile

diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 4eedd56..af81fee 100644 (file)
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -11,9 +11,7 @@ soupincludedir = $(includedir)/soup
 
 lib_LTLIBRARIES = libsoup.la
 
-libsoup_la_LDFLAGS = \
-        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -release $(LT_RELEASE)
+libsoup_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libsoup_la_SOURCES =           \
        soup-context.c          \