X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=ec471369d8186c8f84ce6f97ad6fdb29a8bbf419;hb=f93c07ddf4f3a4d51461edd1ceb27114f5c45d5b;hp=8e3d44f252b15d1423315d59a1c1369ee0c02583;hpb=490972cd48aa57027c68b548a735865d024ca420;p=catagits%2Ffcgi2.git

diff --git a/configure.in b/configure.in
index 8e3d44f..ec47136 100755
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl     $Id: configure.in,v 1.10 2001/09/21 22:54:28 skimo Exp $
+dnl     $Id: configure.in,v 1.18 2001/11/21 16:32:55 robs Exp $
 dnl
 dnl     This file is an input file used by the GNU "autoconf" program to
 dnl     generate the file "configure", which is run during the build
@@ -7,13 +7,31 @@ dnl     to configure the system for the local environment.
 AC_INIT
 AM_INIT_AUTOMAKE(fcgi, 2.2.1)
 
-AM_CONFIG_HEADER([include/fcgi_config.h])
+AM_CONFIG_HEADER(fcgi_config.h)
 
 AC_PROG_CC
 AC_PROG_CPP 
 AC_PROG_INSTALL 
 AC_PROG_LIBTOOL
 
+AC_PROG_CXX
+
+dnl autoconf defaults CXX to 'g++', so its unclear whether it exists/works
+AC_MSG_CHECKING([whether $CXX works])
+AC_LANG_CPLUSPLUS
+AC_TRY_COMPILE([#include <iostream.h>], [istream is(NULL);], 
+               [CXX_WORKS=1]
+               [AC_MSG_RESULT(yes)], 
+               [AC_MSG_RESULT(no)])
+AC_LANG_C
+
+if test -n "${CXX_WORKS}"; then
+	LIBFCGIXX=libfcgi++.la
+	ECHO_CPP=echo-cpp${EXEEXT}
+fi
+AC_SUBST(LIBFCGIXX)
+AC_SUBST(ECHO_CPP)
+
 AC_CHECK_LIB([nsl],       [main]) ac_cv_lib_nsl=ac_cv_lib_nsl_main
 AC_CHECK_LIB([resolv],    [main]) ac_cv_lib_resolv=ac_cv_lib_resolv_main
 AC_CHECK_LIB([socket], 	  [main]) ac_cv_lib_socket=ac_cv_lib_socket_main
@@ -25,7 +43,7 @@ AC_CHECK_LIB([pthread],	  [main],
 	[AC_DEFINE([HAVE_LIBPTHREAD], [1],
 			   [Define if you have the pthread library])
 	 AC_SUBST([HAVE_LIBPTHREAD])
-         threaded=threaded]) 
+         threaded='threaded$(EXEEXT)']) 
 ac_cv_lib_pthread=ac_cv_lib_pthread_main
 
 FCGI_COMMON_CHECKS
@@ -44,14 +62,13 @@ SYSTEM=unix
 AC_SUBST([SYSTEM])
 
 if test "$GCC"; then
-	CCDEFS="$CCDEFS -Wall -Wmissing-prototypes"
+	CFLAGS="$CFLAGS -Wall -Wmissing-prototypes"
 fi
 
-AC_SUBST([CCDEFS])
-
-AC_CONFIG_FILES([Makefile 
-		 libfcgi/Makefile 
-		 cgi-fcgi/Makefile 
-		 examples/Makefile])
+AC_CONFIG_FILES(Makefile
+		cgi-fcgi/Makefile
+		include/Makefile
+		libfcgi/Makefile
+		examples/Makefile)
 
 AC_OUTPUT