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

2006-02-02 08:35:18 +00:00
parent f876823967
commit e809917cf6
6 changed files with 39 additions and 10 deletions
@@ -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