--- deliantra/server/configure.ac 2006/09/01 13:58:06 1.17 +++ deliantra/server/configure.ac 2006/09/04 11:07:58 1.18 @@ -168,6 +168,17 @@ AC_MSG_RESULT(unknown) fi +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + +AC_MSG_CHECKING(glib >= 2.10) +if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then + CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`" + LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`" + AC_MSG_RESULT(ok) +else + AC_MSG_ERROR(no) +fi + AC_SUBST(x_includes) AC_SUBST(x_libraries) AC_SUBST(no_x) @@ -192,7 +203,7 @@ AC_MSG_CHECKING(for $PERL suitability) if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then - save_CFLAGS="$CFLAGS" + save_CXXFLAGS="$CXXFLAGS" save_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`" LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"