X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=1ab497a8f99ec42cdb17504aef781417a702747b;hp=faa5d4addcd8a7c153f706c208d0b8afee283137;hb=b71d1e5ef301b21c2bb33c1a205c971b0a51b769;hpb=c2708c767b300a33c8636681ed4550d4f3be0ce0

diff --git a/configure.ac b/configure.ac
index faa5d4ad..1ab497a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,8 +80,9 @@ audiod_errlist_objs="audiod signal string daemon stat net
 audiod_ldflags=""
 audiod_audio_formats=""
 
-server_cmdline_objs="server.cmdline"
-server_errlist_objs="server mp3_afh afs command net string signal random_selector
+server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
+	playlist_selector_command_list"
+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 user_list"
 server_ldflags=""
@@ -185,17 +186,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"], [
@@ -231,6 +241,7 @@ if test "$have_mysql" = "yes"; then
 	selectors="$selectors mysql"
 	server_ldflags="$server_ldflags $mysql_libs -lmysqlclient"
 	server_errlist_objs="$server_errlist_objs mysql_selector"
+	server_cmdline_objs="$server_cmdline_objs mysql_selector_command_list"
 	AC_SUBST(mysql_cppflags)
 	AC_SUBST(mysql_libs)
 	AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support])
@@ -445,6 +456,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"