From dc6288f7d2c41a806f6b5c6f4dd429c5373b94ec Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Mon, 2 Oct 2006 12:33:13 +0000
Subject: [PATCH] small glitches detected on suse / gcc 4.1

---
 src/VERSION         | 2 +-
 src/configure       | 5 +++--
 src/configure.ac    | 2 +-
 src/query/history.h | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/VERSION b/src/VERSION
index 4cda8f19..8af85beb 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.5.2
+1.5.3
diff --git a/src/configure b/src/configure
index ff904a35..323d81f8 100755
--- a/src/configure
+++ b/src/configure
@@ -2192,7 +2192,7 @@ LIBXAPIAN=`$XAPIAN_CONFIG --libs`
 # libstdc++.la in the lib list
 for i in $LIBXAPIAN ; do
     case $i in
-    *libstdc++.la);;
+    *stdc++*|-lm|-lgcc_s);;
     *) tmpxaplib="$tmpxaplib $i";;
     esac
 done
@@ -2296,7 +2296,8 @@ it and/or set the QTDIR environment variable?" >&2;}
 fi
 
 cd $QTGUI
-# We just want a .pro file: no problem with unsubstituted variables for now
+# We just want a .pro file: no problem with unsubstituted variables at
+# this point.
 test -f recoll.pro && chmod +w recoll.pro
 cp recoll.pro.in recoll.pro
 ${QMAKE} recoll.pro
diff --git a/src/configure.ac b/src/configure.ac
index 95ef77ac..6b615a07 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -58,7 +58,7 @@ LIBXAPIAN=`$XAPIAN_CONFIG --libs`
 # libstdc++.la in the lib list
 for i in $LIBXAPIAN ; do
     case $i in
-    *libstdc++.la);;
+    *stdc++*|-lm|-lgcc_s);;
     *) tmpxaplib="$tmpxaplib $i";;
     esac
 done
diff --git a/src/query/history.h b/src/query/history.h
index f4a7a0ff..760c85b8 100644
--- a/src/query/history.h
+++ b/src/query/history.h
@@ -16,7 +16,7 @@
  */
 #ifndef _HISTORY_H_INCLUDED_
 #define _HISTORY_H_INCLUDED_
-/* @(#$Id: history.h,v 1.5 2006-09-11 12:05:39 dockes Exp $  (C) 2004 J.F.Dockes */
+/* @(#$Id: history.h,v 1.6 2006-10-02 12:33:13 dockes Exp $  (C) 2004 J.F.Dockes */
 
 /**
  * Dynamic configuration storage
@@ -46,6 +46,7 @@ using namespace std;
 
 class HistoryEntry {
  public:
+    virtual ~HistoryEntry() {}
     virtual bool decode(const string &value) = 0;
     virtual bool encode(string& value) = 0;
     virtual bool equal(const HistoryEntry &other) = 0;