Build communication channel and add checks for C++ library

2 files changed, 50 insertions, 1 deletions

diff --git a/Zend/configure.in b/Zend/configure.in
index bc694bc3b3..dba42d2e72 100644
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -155,11 +155,17 @@ AC_SUBST(TSRM_LIB)
 AC_SUBST(ZEND_SCANNER_SRC)
 AC_SUBST(ZEND_SCANNER_COMPILE)
 
+if test "$enable_thread_safety" = "yes" ; then
+AC_CHECK_LIB(C, cin)
+AC_CHECK_LIB(g++, cin)
+AC_CHECK_LIB(stdc++, cin)
+fi
+
 AC_SUBST(CFLAGS_SHLIB)
 AC_SUBST(LDFLAGS_SHLIB)
 AC_SUBST(LDFLAGS_SHLIB_EXPORT)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile zend_config)
 
 
 # Local Variables:
diff --git a/Zend/zend_config.in b/Zend/zend_config.in
new file mode 100755
index 0000000000..c80000c8da
--- /dev/null
+++ b/Zend/zend_config.in
@@ -0,0 +1,43 @@
+#! /bin/sh
+#
+# $Id$
+#
+# Written by Sascha Schumann <sascha@schumann.cx>
+
+
+# taken from autoconf
+
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='    '
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+flags_libs="@LIBS@"
+flags_ldflags="@LDFLAGS@"
+flags_cflags="@CPPFLAGS@ @CFLAGS@"
+
+case "$1" in
+--ldflags)
+	echo $ac_n "$flags_ldflags$ac_c"
+;;
+--cflags)
+	echo $ac_n "$flags_cflags$ac_c"
+;;
+--libs)
+	echo $ac_n "$flags_libs$ac_c"
+;;
+*)
+	echo "$0 [--libs|--cflags|--ldflags]"
+	exit 1
+;;
+esac
+
+exit 0