ocaml 3.09 transition

[helm.git] / helm / helmpot / configure.in

diff --git a/helm/helmpot/configure.in b/helm/helmpot/configure.in
index 640472467942c1877b5447eb781cdb360e2107c0..3d31a0d548439b13170ae4c321406bde60ddbb44 100644 (file)
--- a/helm/helmpot/configure.in
+++ b/helm/helmpot/configure.in
@@ -48,25 +48,13 @@ if test $gtklib = "no"; then
        AC_MSG_ERROR(GTK is needed in order to use helmpot)
 fi
 
-AC_CHECK_PROG(HAVE_GTKMATHVIEW_CONFIG, gtkmathview-config, yes, no)
-if test $HAVE_GTKMATHVIEW_CONFIG = "no"; then
-       AC_MSG_ERROR(gtkmathview is required)
-fi
-
-GTKMATHVIEW_MIN_VERSION=0.3.0
-AC_MSG_CHECKING(for gtkmathview >= $GTKMATHVIEW_MIN_VERSION)
-vers=`gtkmathview-config --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-minvers=`echo $GTKMATHVIEW_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-if test "$vers" -lt "$minvers"; then
-       AC_MSG_RESULT(not found)
-       AC_MSG_ERROR(gtkmathview >= $GTKMATHVIEW_MIN_VERSION is required)
-else
-       AC_MSG_RESULT(found)
-fi
+CFLAGS="$CFLAGS @GTKMATHVIEW_CFLAGS@"
+CXXFLAGS="$CXXFLAGS @GTKMATHVIEW_CFLAGS@"
+LIBS="$LIBS @GTKMATHVIEW_LIBS@"
 
-CFLAGS="$CFLAGS `gtkmathview-config --cflags`"
-CXXFLAGS="$CXXFLAGS `gtkmathview-config --cflags`"
-LIBS="$LIBS `gtkmathview-config --libs`"
+PKG_CHECK_MODULES(GTKMATHVIEW, gtkmathview >= 0.3.0,, AC_MSG_ERROR(could not find gtkmathview))
+AC_SUBST(GTKMATHVIEW_CFLAGS)
+AC_SUBST(GTKMATHVIEW_LIBS)
 
 if test $HAVE_COLORGCC = "yes"; then
        CC=colorgcc