Support for Sun CC 5.0.

diff --git a/libasprintf/Makefile.am b/libasprintf/Makefile.am
index f004f6c70731489093cb763414127e56d6f7074d..1ff05aa6f9ef157c7ff81070ab2e58a1b3c62e54 100644 (file)
--- a/libasprintf/Makefile.am
+++ b/libasprintf/Makefile.am
@@ -46,6 +46,9 @@ lib_asprintf_EXTRASOURCES = \
 lib-asprintf.lo: $(lib_asprintf_EXTRASOURCES)
 
 # How to build libasprintf.la.
+
+libasprintf_la_LIBADD = $(LIBCXX)
+
 libasprintf_la_LDFLAGS = -lc -no-undefined
 
 

diff --git a/libasprintf/configure.in b/libasprintf/configure.in
index ec9e8a4b7fe13e9226ea04b3bd93e7baa6e73826..b66ecf4dc02737802b8faa4536f896c118c3fbb6 100644 (file)
--- a/libasprintf/configure.in
+++ b/libasprintf/configure.in
@@ -39,6 +39,49 @@ dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS([snprintf vasprintf])
 
+dnl Check for C++ libraries needed to avoid link errors when creating
+dnl libasprintf.
+LIBCXX=
+cat > conftest.cc <<EOF
+#ifdef __SUNPRO_C
+SunPro C
+#endif
+#ifdef __SUNPRO_CC
+SunPro C++
+#endif
+EOF
+if $CXX -E conftest.cc  | grep SunPro > /dev/null ; then
+  # SUNWspro CC, defines __SUNPRO_CC
+  cxxcmd=CC
+  for word in $CXX; do
+    case "$word" in
+      CC | */CC) cxxcmd=$word ;;
+    esac
+  done
+  case "$cxxcmd" in
+    */*) ;;
+    *)
+      IFS="${IFS=       }"; save_ifs="$IFS"; IFS="${IFS}:"
+      for dir in $PATH; do
+        test -z "$dir" && dir=.
+        if test -f "$dir/$cxxcmd"; then
+          cxxcmd="$dir/$cxxcmd"
+          break
+        fi
+      done
+      IFS="$save_ifs"
+      ;;
+  esac
+  case "$cxxcmd" in
+    */bin/CC)
+      cxxdir=`echo "$cxxcmd" | sed -e 's,/bin/CC$,,'`
+      LIBCXX="-L$cxxdir -lCstd -lCrun"
+      ;;
+  esac
+fi
+rm -f conftest.cc
+AC_SUBST(LIBCXX)
+
 dnl Check for tools needed for formatting the documentation.
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
 AC_PATH_PROG(DVIPS, dvips, $ac_aux_dir_abs/missing dvips)