Ticket #622: xapian.patch

configure.ac

@@ -1280 +1280 @@
     cxxcpp_flags="$cxxcpp_flags -DXAPIAN_HAS_${backend}_BACKEND"
   fi
 done
-if test yes = "$GXX" ; then
-    dnl If _GLIBCXX_DEBUG is being deliberately set or unset, do the same
-    dnl when generating version.h.
-    for flag in $CXXFLAGS $CPPFLAGS ; do
-      case $flag in
-      -D_GLIBCXX_DEBUG*|-U_GLIBCXX_DEBUG*) cxxcpp_flags="$cxxcpp_flags $flag" ;;
-      esac
-    done
-fi
 rm -f include/xapian/version.h.tmp
 dnl "\r" in sed is a GNUism, but we only need to remove it on MS Windows
 dnl where we'll always have GNU sed, and other sed's will just interpret
 dnl it as "r" (Solaris sed) or maybe literal "\r" which won't match.
 dnl
 dnl Use @@ around $MAIN_VERSION so we get " in the final output.
-$CXXCPP $cxxcpp_flags\
+$CXXCPP $cxxcpp_flags $CXXFLAGS $CPPFLAGS\
         -DSTRING_VERSION="\"@@$MAIN_VERSION@@\""\
         -DMAJOR_VERSION="\"$MAJOR_VERSION\""\
         -DMINOR_VERSION="\"$MINOR_VERSION\""\