From 7f387ae6a92fc63d50225e0e942871fe2ef61b6e Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Sun, 18 May 2008 11:39:51 +0000 Subject: [PATCH] Fixed a conflict in configure.ac, adding the GLIB_ flags to the C flags --- configure.ac | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 265aa29..080dfbc 100644 --- a/configure.ac +++ b/configure.ac @@ -159,12 +159,8 @@ AC_SUBST(C_INT_SIZE) common_cflags="-Wall -ggdb3 -Isupport -fno-strict-aliasing" -CCSP_CFLAGS="`kroc --cflags` `kroc --ccincpath`" -CCSP_LIBS="`kroc --cclibpath` -lccsp -lpthread -ldl -lm" - -TOCK_CFLAGS="$gnu89_inline $CPPFLAGS $CFLAGS $common_cflags $CCSP_CFLAGS" -# FIXME: -ldl is only necessary on some platforms for CCSP -TOCK_CLDFLAGS="$LDFLAGS $CCSP_LIBS" +TOCK_CFLAGS="$gnu89_inline $CPPFLAGS $CFLAGS $common_cflags $CCSP_CFLAGS $GLIB_CFLAGS" +TOCK_CLDFLAGS="$LDFLAGS $CCSP_LIBS $GLIB_LIBS" TOCK_CXXFLAGS="$CPPFLAGS $CXXFLAGS $common_cflags $CPPCSP2_CFLAGS" TOCK_CXXLDFLAGS="$LDFLAGS $CPPCSP2_LIBS"