src/rrdd.c et al.: Use the tree implementation from GLib 2.0.

[rrdd.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 80dcb94..d94114b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,11 @@ AC_LANG(C)
 
 AC_PREFIX_DEFAULT("/opt/rrdd")
 
-AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
-
+PKG_PROG_PKG_CONFIG
 
 AC_LIBLTDL_CONVENIENCE
 AC_SUBST(LTDLINCL)
@@ -19,6 +20,29 @@ AC_PROG_LIBTOOL
 AC_CONFIG_SUBDIRS(libltdl)
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(avl.h)
+
+$PKG_CONFIG --exists glib-2.0 2>/dev/null
+if test "$?" != "0"
+then
+       AC_MSG_ERROR("Cannot find the glib-2.0 library.")
+fi
+GLIB_CPPFLAGS=`$PKG_CONFIG --cflags glib-2.0`
+GLIB_LDADD=`$PKG_CONFIG --libs glib-2.0`
+AC_SUBST(GLIB_CPPFLAGS)
+AC_SUBST(GLIB_LDADD)
+
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+CPPFLAGS="$CPPFLAGS $GLIB_CPPFLAGS"
+LDFLAGS="$LDFLAGS $GLIB_LDADD"
+
+AC_CHECK_HEADERS(glib-2.0/glib.h)
+AC_CHECK_LIB(glib-2.0, g_tree_new, [have_libglib_2_0="yes"], [have_libglib_2_0="no"])
+
+CPPFLAGS="$SAVE_CPPFLAGS"
+LDFLAGS="$SAVE_LDFLAGS"
+
+AC_CHECK_HEADERS(rrd.h)
+AC_CHECK_LIB(rrd_th, rrd_update_r, [have_librrd_th="yes"], [have_librrd_th="no"])
 
 AC_OUTPUT(Makefile src/Makefile)