SOURCES: openoffice.org-mdbtools_fix.diff - fixed (previous versio...

[sls]

Author: sls                          Date: Mon Oct 30 17:33:39 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed (previous version was screwed)

---- Files affected:
SOURCES:
   openoffice.org-mdbtools_fix.diff (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/openoffice.org-mdbtools_fix.diff
diff -u SOURCES/openoffice.org-mdbtools_fix.diff:1.1 SOURCES/openoffice.org-mdbtools_fix.diff:1.2
--- SOURCES/openoffice.org-mdbtools_fix.diff:1.1	Tue Oct 24 23:41:06 2006
+++ SOURCES/openoffice.org-mdbtools_fix.diff	Mon Oct 30 18:33:34 2006
@@ -1,13 +1,25 @@
---- config_office/configure.in.orig	2006-08-17 08:31:43.000000000 +0000
-+++ config_office/configure.in	2006-08-17 08:32:47.000000000 +0000
-@@ -3208,7 +3208,9 @@
- 	PKG_CHECK_MODULES(GLIB, glib-2.0)
-    	AM_ICONV
- 	if test "$am_cv_func_iconv" = "yes"; then
--      MDBTOOLS_CFLAGS=-DHAVE_ICONV
-+      MDBTOOLS_CFLAGS="-DHAVE_ICONV -I/usr/include/mdb/"
-+   else
-+      MDBTOOLS_CFLAGS=-I/usr/include/mdb/
-    fi
- dnl   save_CFLAGS=$CFLAGS
- dnl	CFLAGS="$GLIB_CFLAGS -I. $MDBTOOLS_CFLAGS"
+--- ooo-build-src680-m176/patches/src680/cws-mdbdriver02.diff.orig	2006-08-17 09:00:24.000000000 +0000
++++ ooo-build-src680-m176/patches/src680/cws-mdbdriver02.diff	2006-08-17 09:02:28.000000000 +0000
+@@ -8817,7 +8817,7 @@
+  
+  AC_ARG_ENABLE(symbols,
+  [  --enable-symbols        Include debugging symbols in output.
+-@@ -3348,6 +3354,45 @@ else
++@@ -3348,6 +3354,48 @@ else
+  fi
+  AC_SUBST(SYSTEM_SANE_HEADER)
+  
+@@ -8839,8 +8839,11 @@
+ +	PKG_CHECK_MODULES(GLIB, glib-2.0)
+ +   	AM_ICONV
+ +	if test "$am_cv_func_iconv" = "yes"; then
+-+      MDBTOOLS_CFLAGS=-DHAVE_ICONV
+-+   fi
+++		MDBTOOLS_CFLAGS="-DHAVE_ICONV -I/usr/include/mdb/"
+++	else
+++		MDBTOOLS_CFLAGS=-I/usr/include/mdb/
+++	fi
+++	CFLAGS="$CFLAGS $MDBTOOLS_CFLAGS"
+ +dnl   save_CFLAGS=$CFLAGS
+ +dnl	CFLAGS="$GLIB_CFLAGS -I. $MDBTOOLS_CFLAGS"
+ +dnl	export CFLAGS
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/openoffice.org-mdbtools_fix.diff?r1=1.1&r2=1.2&f=u