X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=e980b080b1a08c7e3bce92dedb61f6aaa79e8639;hp=efd27d4e518be5782045408b9d4be4cb42b05ce3;hb=72f89f0b1cc84aca6e1770a6142aee3e6542967c;hpb=8e1e5cc794c84fcfee75f701b339ae85a02eb1b8

diff --git a/configure.ac b/configure.ac
index efd27d4e..e980b080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,9 +81,9 @@ audiod_ldflags=""
 audiod_audio_formats=""
 
 server_cmdline_objs="server.cmdline"
-server_errlist_objs="server mp3_afh afs command net string signal random_selector
+server_errlist_objs="server mp3_afh vss command net string signal random_selector
 	time daemon stat crypt http_send db close_on_fork playlist_selector
-	ipc dccp dccp_send fd"
+	ipc dccp dccp_send fd user_list"
 server_ldflags=""
 server_audio_formats=" mp3"
 
@@ -185,17 +185,26 @@ if test ${have_core_audio} = yes; then
 	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
 ########################################################################### gtk2
-pkg_modules="gtk+-2.0 >= 2.0.0"
 build_para_krell="yes"
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+pkg_modules="gtk+-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.4], [], [build_para_krell="no"])
 PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_krell="no"])
+CPPFLAGS="$GTK_CFLAGS $GLIB_CFLAGS"
+LDFLAGS="$LDFLAGS $GTK_LIBS"
 AC_CHECK_HEADER(gkrellm2/gkrellm.h, [], [build_para_krell="no"])
-if test build_para_krell = "yes"; then
+if test "$build_para_krell" = "yes"; then
 	AC_SUBST(GTK_CFLAGS)
 	AC_SUBST(GTK_LIBS)
 	extras="$extras para_krell.so"
 else
 	AC_MSG_WARN([can not build para_krell])
 fi
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### sdl
 # FIXME
 AC_CHECK_LIB([SDL_image], [SDL_Init], [extras="$extras para_sdl_gui"], [
@@ -445,6 +454,7 @@ build_slider="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
+PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_slider="no"])
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.4], [], [build_slider="no"])
 CPPFLAGS="$GTK_CFLAGS $GLIB_CFLAGS"
 LDFLAGS="$LDFLAGS $GTK_LIBS"