fix small cc glitches: qt3.1, xapian-config

src/Makefile.in

@@ -1,4 +1,4 @@
-# @(#$Id: Makefile.in,v 1.2 2006-01-21 15:36:05 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile.in,v 1.3 2006-02-02 08:35:17 dockes Exp $  (C) 2005 J.F.Dockes
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -43,6 +43,7 @@ clean:
 
 distclean: clean
 	rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \
+	   qtgui/recoll.pro Makefile \
 	   recollinstall \
 	   doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest
 

src/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

src/configure

@@ -2183,11 +2183,20 @@ xapian-core installed ?" >&2;}
    exit 1
 fi
 LIBXAPIAN=`$XAPIAN_CONFIG --libs`
+# Workaround for problem in xapian-config in some versions: wrongly lists
+# libstdc++.la in the lib list
+for i in $LIBXAPIAN ; do
+    case $i in
+    *libstdc++.la);;
+    *) tmpxaplib="$tmpxaplib $i";;
+    esac
+done
+LIBXAPIAN=$tmpxaplib
 XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
 
-#echo XAPIAN_CONFIG $XAPIAN_CONFIG
-#echo LIBXAPIAN $LIBXAPIAN
-#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
+#echo XAPIAN_CONFIG: $XAPIAN_CONFIG
+#echo LIBXAPIAN: $LIBXAPIAN
+#echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
 
 #### QT
 # The way qt and its tools (qmake especially) are installed is very

src/configure.ac

@@ -54,11 +54,20 @@ xapian-core installed ?])
    exit 1
 fi
 LIBXAPIAN=`$XAPIAN_CONFIG --libs`
+# Workaround for problem in xapian-config in some versions: wrongly lists
+# libstdc++.la in the lib list
+for i in $LIBXAPIAN ; do
+    case $i in
+    *libstdc++.la);;
+    *) tmpxaplib="$tmpxaplib $i";;
+    esac
+done
+LIBXAPIAN=$tmpxaplib
 XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
 
-#echo XAPIAN_CONFIG $XAPIAN_CONFIG 
-#echo LIBXAPIAN $LIBXAPIAN
-#echo XAPIANCXXFLAGS $XAPIANCXXFLAGS
+#echo XAPIAN_CONFIG: $XAPIAN_CONFIG 
+#echo LIBXAPIAN: $LIBXAPIAN
+#echo XAPIANCXXFLAGS: $XAPIANCXXFLAGS
 
 #### QT
 # The way qt and its tools (qmake especially) are installed is very

src/qtgui/main.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: main.cpp,v 1.36 2006-01-30 09:28:50 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: main.cpp,v 1.37 2006-02-02 08:35:18 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -211,8 +211,14 @@ int main( int argc, char ** argv )
 
     if (!maybeOpenDb(reason)) {
 	startindexing = 1;
+
 	switch (QMessageBox::
-		question(0, "Recoll",
+#if (QT_VERSION < 0x030200)
+		question
+#else
+		information
+#endif
+		(0, "Recoll",
 			 app.translate("Main", "Could not open database in ")+
 			 QString(dbdir) +
 			 app.translate("Main", 

src/qtgui/preview/preview.ui.h

@@ -47,6 +47,10 @@ using std::pair;
 #include "wipedir.h"
 #include "cancelcheck.h"
 
+#if (QT_VERSION < 0x030300)
+#define wasCanceled wasCancelled
+#endif
+
 // We keep a list of data associated to each tab
 class TabData {
  public: