From 72f89f0b1cc84aca6e1770a6142aee3e6542967c Mon Sep 17 00:00:00 2001
From: Andre <maan@meins.(none)>
Date: Fri, 12 Jan 2007 23:28:25 +0100
Subject: [PATCH] configure.ac: fix checks for para_krell

---
 NEWS         |  8 ++++++++
 configure.ac | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index ccfdf720..5e450c69 100644
--- a/NEWS
+++ b/NEWS
@@ -4,14 +4,22 @@ NEWS
 ----------------------------------------------
 0.2.15 (to be announced) "inductive resonance"
 ----------------------------------------------
+
+Minor improvements and a bunch of bug fixes.
+
 	- para_server: The server.users file is only read once on server
 	  startup rather than for each connection
 	- mp3dec: Fix decoding of corrupt mp3 files
+	- afs (audio file sender) is now called vss (virtual streaming
+	  system). Consequently, the permission flags specified in
+	  ~/.paraslash/server.users have also changed: AFS_READ and AFS_WRITE
+	  become VSS_READ and VSS_WRITE respectively.
 	- para_audiod/para_filter: Fix a bug that caused the last chunk
 	  of audio data not being written under certain circumstances
 	- audiod: compute the difference of server time and local time
 	  correctly
 	- documentation improvements
+	- configure.ac: fix checks for para_krell
 
 -------------------------------------------
 0.2.14 (2006-10-15) "transient singularity"
diff --git a/configure.ac b/configure.ac
index 49770573..e980b080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"
-- 
2.39.5