Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -14,7 +14,14 @@ m4_include([m4/ac_prog_javac.m4])
 m4_include([m4/ac_prog_java_works.m4])
 m4_include([m4/ac_prog_java.m4])
 m4_include([m4/ax_cxx_compile_stdcxx.m4])
+m4_include([m4/tsk_opt_dep_check.m4])
 
+AC_DEFUN([TSK_PKG_CHECK_MODULES],
+[
+  m4_ifdef([PKG_CHECK_MODULES],
+    [PKG_CHECK_MODULES([$1], [$3], [$4], [$5])])
+])
+
 AC_CONFIG_SRCDIR([tsk/base/tsk_base.h])
 AC_CONFIG_HEADERS([tsk/tsk_config.h])
 AC_CONFIG_AUX_DIR(config)
@@ -121,7 +128,7 @@ dnl Checks for libraries.
 
 
 dnl Some platforms will complain about missing included functions if libstdc++ is not included.
-AC_CHECK_LIB(stdc++, main, , AC_MSG_ERROR([missing libstdc++]))
+dnl AC_CHECK_LIB(stdc++, main, , AC_MSG_ERROR([missing libstdc++]))
 AC_CHECK_HEADERS(list, , , AC_MSG_ERROR([missing STL list class header]))
 AC_CHECK_HEADERS(map, , , AC_MSG_ERROR([missing STL map class header]))
 AC_CHECK_HEADERS(queue, , , AC_MSG_ERROR([missing STL queue class header]))
