From be12cc73176a08d390cb7700c5c1bfb46e97eec4 Mon Sep 17 00:00:00 2001 From: Andre Date: Mon, 25 Sep 2006 20:35:12 +0200 Subject: [PATCH] configure.ac: fix para_slider configuration It depends on GLIB, so add a check for GLIB that was removed long ago as ortp dropped glib. --- configure.ac | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 408851ed..d33205bc 100644 --- a/configure.ac +++ b/configure.ac @@ -414,19 +414,21 @@ fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" ########################################################################### zmw -slide="para_slider" -msg="can not build para_slider" -CPPFLAGS="$GTK_CFLAGS" +build_slider="yes" +OLD_CPPFLAGS="$CPPFLAGS" +OLD_LD_FLAGS="$LDFLAGS" +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.4], [], [build_slider="no"]) +CPPFLAGS="$GTK_CFLAGS $GLIB_CFLAGS" LDFLAGS="$LDFLAGS $GTK_LIBS" -AC_CHECK_HEADERS([zmw/zmw.h], [], [ - AC_MSG_WARN([zero memory widget header files not found, $msg]) - slide="" -]) -AC_CHECK_LIB([zmw], [zmw_init], [], [ - AC_MSG_WARN([zero memory widget library not found, $msg]) - slide="" -]) -extras="$extras $slide" +AC_CHECK_HEADERS([zmw/zmw.h], [], [build_slider="no"]) +AC_CHECK_LIB([zmw], [zmw_init], [], [build_slider="no"]) +if test "$build_slider" = "no"; then + AC_MSG_WARN([will not build para_slider]) +else + extras="$extras para_slider" +fi +CPPFLAGS="$OLD_CPPFLAGS" +LDFLAGS="$OLD_LDFLAGS" -- 2.39.2