From b5cecb2b7152efe4c248bc89c07b469165de33f6 Mon Sep 17 00:00:00 2001
From: Valient Gough <vgough@pobox.com>
Date: Sun, 28 Dec 2008 05:56:20 +0000
Subject: [PATCH] bump version to 1.5.1 improve configure check for rlog to use
 RLOG_LIBS if set and pkg-check fails

git-svn-id: http://encfs.googlecode.com/svn/trunk@45 db9cf616-1c43-0410-9cb8-a902689de0d6
---
 configure.ac | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 72c27c7..29aa7d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(encfs/encfs.h) dnl a source file from your sub dir
-AM_INIT_AUTOMAKE(encfs, 1.5) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(encfs, 1.5.1) dnl searches for some needed programs
+
+RELEASE=1
+AC_SUBST(RELEASE)
 
 dnl without this order in this file, automake will be confused!
 dnl
@@ -13,9 +16,6 @@ unset CDPATH
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
     
-RELEASE=1
-AC_SUBST(RELEASE)
-
 dnl almost the same like KDE_SET_PEFIX but the path is /usr/local
 dnl
 unset CDPATH
@@ -178,12 +178,14 @@ if test "x$with_openssl" != "xyes"; then
 fi
 
 # check for RLOG
-PKG_CHECK_MODULES(RLOG, librlog >= 1.3,
-	with_rlog="yes", 
-	[ # do old-style test instead..
-	AC_MSG_WARN([Checking for librlog the hard way])
-	AC_CHECK_LIB(rlog, RLogVersion, [RLOG_LIBS="-lrlog"],
-	    [AC_MSG_ERROR([EncFS depends on librlog, by the same author.])]) ])
+PKG_CHECK_MODULES(RLOG, librlog >= 1.3, with_rlog="yes", with_rlog="test")
+
+# manual check for rlog, unless environment variable already set
+if test "$with_rlog" = "test" && test "x$RLOG_LIBS" = "x"; then
+    AC_MSG_WARN([Checking for librlog the hard way])
+    AC_CHECK_LIB(rlog, RLogVersion, [RLOG_LIBS="-lrlog"],
+        [AC_MSG_ERROR([EncFS depends on librlog])]) 
+fi
 
 # look for pod2man program for building man pages
 AC_PATH_PROG(POD2MAN, pod2man, [no])