openoffice.org-mdbtools_fix.diff

   1 --- ooo-build-src680-m176/patches/src680/cws-mdbdriver02.diff.orig      2006-08-17 09:00:24.000000000 +0000
   2 +++ ooo-build-src680-m176/patches/src680/cws-mdbdriver02.diff   2006-08-17 09:02:28.000000000 +0000
   3 @@ -8817,7 +8817,7 @@
   4
   5   AC_ARG_ENABLE(symbols,
   6   [  --enable-symbols        Include debugging symbols in output.
   7 -@@ -3348,6 +3354,45 @@ else
   8 +@@ -3348,6 +3354,48 @@ else
   9   fi
  10   AC_SUBST(SYSTEM_SANE_HEADER)
  11
  12 @@ -8839,8 +8839,11 @@
  13  +      PKG_CHECK_MODULES(GLIB, glib-2.0)
  14  +      AM_ICONV
  15  +      if test "$am_cv_func_iconv" = "yes"; then
  16 -+      MDBTOOLS_CFLAGS=-DHAVE_ICONV
  17 -+   fi
  18 ++              MDBTOOLS_CFLAGS="-DHAVE_ICONV -I/usr/include/mdb/"
  19 ++      else
  20 ++              MDBTOOLS_CFLAGS=-I/usr/include/mdb/
  21 ++      fi
  22 ++      CFLAGS="$CFLAGS $MDBTOOLS_CFLAGS"
  23  +dnl   save_CFLAGS=$CFLAGS
  24  +dnl   CFLAGS="$GLIB_CFLAGS -I. $MDBTOOLS_CFLAGS"
  25  +dnl   export CFLAGS