-case $cf_cv_system_name in
-(os2*)
- cf_stdcpp_libname=stdcpp
- ;;
-(*)
- cf_stdcpp_libname=stdc++
- ;;
-esac
-echo "$as_me:19325: checking for library $cf_stdcpp_libname" >&5
+
+ cf_save="$LIBS"
+ LIBS="$LIBS $CXXLIBS"
+ echo "$as_me:19321: checking if we already have C++ library" >&5
+echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+#line 19324 "configure"
+#include "confdefs.h"
+
+ #include <iostream>
+int
+main ()
+{
+
+ std::cout << "Hello World!" << std::endl;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:19338: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:19341: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:19344: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:19347: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_have_libstdcpp=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_libstdcpp=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ echo "$as_me:19356: result: $cf_have_libstdcpp" >&5
+echo "${ECHO_T}$cf_have_libstdcpp" >&6
+ LIBS="$cf_save"
+
+ if test $cf_have_libstdcpp != yes
+ then
+ case $cf_cv_system_name in
+ (os2*)
+ cf_stdcpp_libname=stdcpp
+ ;;
+ (*)
+ cf_stdcpp_libname=stdc++
+ ;;
+ esac
+
+ echo "$as_me:19371: checking for library $cf_stdcpp_libname" >&5