From c48d09fdd088eca7b59d499dd574e880f6b6b8ff Mon Sep 17 00:00:00 2001
From: Qball Cow <qball@sarine.nl>
Date: Wed, 26 Nov 2008 12:00:31 +0100
Subject: [PATCH] Try to fix lirc_client check

---
 autogen.sh      | 35 +++++++++++++++++++++++++++--------
 configure.ac    |  8 +++++++-
 src/Makefile.am |  4 ++--
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index de99adc..2029c12 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,17 +12,36 @@ DIE=
 AM_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
 AC_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9][0-9]\).*/\1/"
 VERSIONMKINT="sed -e s/[^0-9]//"
+case `uname` in
+FreeBSD)
+    AM_VERSIONS='1.4 1.5 1.9'
+    AC_VERSIONS='2.53 2.59'
+;;
+#OpenBSD)
+     #Needs works
+#    AM_VERSIONS='1.4 1.8 1.9'
+#    AC_VERSIONS='2.13 2.52 2.57 2.59'
+#;;
+*)
+ # Use * here not to limit systems we do not have a case for.
+ # wrappers should pick these up without the need of our help.
+ #AM_VERSIONS='1.4 1.5 1.6 1.7 1.8 1.9 1.10'
+ #AC_VERSIONS='2.13 2.58 2.59 2.60'
+ AM_VERSIONS=''
+ AC_VERSIONS=''
+;;
+esac
 if test -n "$AM_FORCE_VERSION"
 then
 	AM_VERSIONS="$AM_FORCE_VERSION"
 else
-	AM_VERSIONS='1.6 1.7 1.8 1.9'
+    $AM_VERSIONS
 fi
 if test -n "$AC_FORCE_VERSION"
 then
 	AC_VERSIONS="$AC_FORCE_VERSION"
 else
-	AC_VERSIONS='2.58 2.59'
+	$AC_VERSIONS
 fi
 
 versioned_bins ()
@@ -143,21 +162,21 @@ for i in $ac_local_paths; do
 done
 
 echo "  $ACLOCAL $ACLOCAL_FLAGS"
-$ACLOCAL $ACLOCAL_FLAGS || exit 1
+$ACLOCAL $ACLOCAL_FLAGS
 
 echo "  $AUTOHEADER"
-$AUTOHEADER || exit 1
+$AUTOHEADER
 
 echo "  $LIBTOOLIZE --automake"
-$LIBTOOLIZE --automake || exit 1
+$LIBTOOLIZE --automake
 
 echo "  $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
-$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
+$AUTOMAKE --add-missing $AUTOMAKE_FLAGS
 
 echo "  $AUTOCONF"
-$AUTOCONF || exit 1
+$AUTOCONF
 
 cd "$olddir"
 if test x$NOCONFIGURE = x; then
-	"$srcdir"/configure "$@" || exit 1
+	"$srcdir"/configure "$@" && echo
 fi
diff --git a/configure.ac b/configure.ac
index 2bf94fb..eb3c15d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,13 @@ AM_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
+AC_CHECK_LIB([lirc_client],[lirc_init],[have_lirc=yes],[have_lirc=no])
+if test "x${have_lirc}" != "xyes"; then
+    AC_MSG_RESULT([*** liblircclient missing ***]) 
+    exit
+fi
+
+
 PKG_CHECK_MODULES([gmpclirc],
 [
 	glib-2.0 >= 2.4
@@ -16,7 +23,6 @@ PKG_CHECK_MODULES([gmpclirc],
 	libxml-2.0
 	libmpd >= 0.13.0
 	gmpc >= 0.14.0
-	liblircclient0 >= 0.8.0
 ])
 AC_SUBST(gmpclirc_LIBS)
 AC_SUBST(gmpclirc_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 16f21dd..cedb265 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,6 @@ lircplugin_la_SOURCES=\
 	plugin.c
 
 
-lircplugin_la_LIBADD= @gmpclirc_LIBS@
-lircplugin_la_CFLAGS= @gmpclirc_CFLAGS@
+lircplugin_la_LIBADD= @gmpclirc_LIBS@ -llirc_client 
+lircplugin_la_CFLAGS= @gmpclirc_CFLAGS@ 
 lircplugin_la_LDFLAGS= -module -avoid-version 
-- 
2.11.4.GIT