2005-10-08 Marcus Brinkmann <[email protected]>

	* configure.ac: Check for socket library and add it to
	LIBASSUAN_CONFIG_LIBS if necessary.

2 files changed, 29 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e0548b..45ada45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-08  Marcus Brinkmann  <[email protected]>
+
+	* configure.ac: Check for socket library and add it to
+	LIBASSUAN_CONFIG_LIBS if necessary.
+
+2005-10-07  Marcus Brinkmann  <[email protected]>
+
+	* configure.ac: Invoke AC_CANONICAL_HOST.  Define _XOPEN_SOURCE,
+	_XOPEN_SOURCE_EXTENDED and __EXTENSIONS__ on Solaris.
+	Add stpcy as replacement function.
+	Add setenv as replacement function (and check for unistd.h).
+
 2005-06-20  Werner Koch  <[email protected]>
 
 	Released 0.6.10.
diff --git a/configure.ac b/configure.ac
index dac899a..24102be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR(src/assuan.h)
 AM_CONFIG_HEADER(config.h)
 
+AC_CANONICAL_HOST
 AC_GNU_SOURCE
 
 
@@ -77,6 +78,11 @@ case "${host}" in
         have_dosish_system=yes
         have_w32_system=yes
         ;;
+    *-solaris*)
+	AC_DEFINE(_XOPEN_SOURCE, 500, Activate extensions on Solaris)
+	AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Activate extensions on Solaris)
+	AC_DEFINE(__EXTENSIONS__, 1, Activate extensions on Solaris)
+	;;
 esac
 
 if test "$have_dosish_system" = yes; then
@@ -92,7 +98,10 @@ if test "$have_w32_system" = yes; then
 fi
 dnl AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 
-
+# Check for network libraries.
+NETLIBS=
+AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
+	[NETLIBS="-lsocket"]))
 
 # For src/libassuan-config.in
 LIBASSUAN_CONFIG_LIBS="-lassuan"
@@ -100,6 +109,9 @@ LIBASSUAN_CONFIG_CFLAGS=""
 if test "$have_w32_system" = yes; then
   LIBASSUAN_CONFIG_LIBS="$LIBASSUAN_CONFIG_LIBS -lwsock32"
 fi
+if test x"$NETLIBS" != x; then
+  LIBASSUAN_CONFIG_LIBS="$LIBASSUAN_CONFIG_LIBS $NETLIBS"
+fi
 AC_SUBST(LIBASSUAN_CONFIG_LIBS)
 AC_SUBST(LIBASSUAN_CONFIG_CFLAGS)
 
@@ -139,6 +151,10 @@ fi
 AC_REPLACE_FUNCS(isascii)
 AC_REPLACE_FUNCS(putc_unlocked)
 AC_REPLACE_FUNCS(memrchr)
+AC_REPLACE_FUNCS(stpcpy)
+# Check for unistd.h for setenv replacement function.
+AC_CHECK_HEADERS(unistd.h)
+AC_REPLACE_FUNCS(setenv)
 
 # Create the config files.
 AC_CONFIG_FILES([Makefile])