ocaml 3.09 transition

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

diff --git a/helm/helmpot/configure.in b/helm/helmpot/configure.in
index 58025f81624a30e8ac6433180d12e1959cc8a57d..3d31a0d548439b13170ae4c321406bde60ddbb44 100644 (file)
--- a/helm/helmpot/configure.in
+++ b/helm/helmpot/configure.in
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(main.c)
 
 HELMPOT_MAJOR_VERSION=0
-HELMPOT_MINOR_VERSION=0
-HELMPOT_MICRO_VERSION=3
+HELMPOT_MINOR_VERSION=1
+HELMPOT_MICRO_VERSION=0
 HELMPOT_VERSION=$HELMPOT_MAJOR_VERSION.$HELMPOT_MINOR_VERSION.$HELMPOT_MICRO_VERSION
 VERSION=$HELMPOT_VERSION
 
@@ -42,35 +42,19 @@ dnl Check for iconv with const pointer as second argument
 AC_LANG_C
 
 dnl Checks for libraries
-AC_CHECK_LIB(gtk, gtk_window_new,
-       [
-               CFLAGS="$CFLAGS `gtk-config --cflags`"
-               CXXFLAGS="$CXXFLAGS `gtk-config --cflags`"
-               LIBS="$LIBS `gtk-config --libs`"
-       ],
-       AC_MSG_ERROR(could not find GTK),
-       `gtk-config --libs`
-)
+AM_PATH_GTK(1.2.0, gtklib="yes", gtklib="no")
 
-AC_CHECK_LIB(minidom, mdom_node_get_type,
-       [
-               CFLAGS="$CFLAGS `minidom-config --cflags`"
-               CXXFLAGS="$CXXFLAGS `minidom-config --cflags`"
-               LIBS="$LIBS `minidom-config --libs`"
-       ],
-       AC_MSG_ERROR(could not find minidom),
-       `minidom-config --libs` `glib-config --libs`
-)
+if test $gtklib = "no"; then
+       AC_MSG_ERROR(GTK is needed in order to use helmpot)
+fi
 
-AC_CHECK_LIB(gtkmathview, gtk_math_view_new,
-       [
-               CFLAGS="$CFLAGS `gtkmathview-config --cflags`"
-               CXXFLAGS="$CXXFLAGS `gtkmathview-config --cflags`"
-               LIBS="$LIBS `gtkmathview-config --libs`"
-       ],
-       AC_MSG_ERROR(cound not find gtkmathview),
-       `gtkmathview-config --libs`
-)
+CFLAGS="$CFLAGS @GTKMATHVIEW_CFLAGS@"
+CXXFLAGS="$CXXFLAGS @GTKMATHVIEW_CFLAGS@"
+LIBS="$LIBS @GTKMATHVIEW_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