[Libreoffice-commits] .: libcdr/libcdr-configure.patch.1

[Libreoffice Gerrit user]

 libcdr/libcdr-configure.patch.1 |   36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

New commits:
commit 8bf3faf995c417b1f833d7c3ee725a2929d4cad6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Oct 5 23:00:27 2012 +0200

    Don't patch configure.ac not to run autotools ever during build
    
    Change-Id: Ib481a70fdb67fcec1b72762c408b27f854fe4d1a

diff --git a/libcdr/libcdr-configure.patch.1 b/libcdr/libcdr-configure.patch.1
index 5100732..ef751fc 100644
--- a/libcdr/libcdr-configure.patch.1
+++ b/libcdr/libcdr-configure.patch.1
@@ -1,5 +1,4 @@
-diff -u cdr.old/configure cdr/configure
---- cdr.old/configure	2012-10-05 21:47:11.246958344 +0200
+--- cdr/configure	2012-10-05 21:47:11.246958344 +0200
 +++ cdr/configure	2012-10-05 22:05:33.913874511 +0200
 @@ -637,6 +617,7 @@
  DOXYGEN
@@ -431,36 +430,3 @@ diff -u cdr.old/configure cdr/configure
  
  
  
-diff -u cdr.old/configure.ac cdr/configure.ac
---- cdr.old/configure.ac	2012-10-05 21:47:11.248958454 +0200
-+++ cdr/configure.ac	2012-10-05 22:05:22.847875386 +0200
-@@ -37,10 +37,16 @@
- # ====================
- # Find additional apps
- # ====================
--PKG_CHECK_MODULES([LIBCDR],[
-+PKG_CHECK_MODULES([WPD],[
- 	libwpd-0.9
- 	libwpd-stream-0.9
-+])
-+
-+PKG_CHECK_MODULES([WPG],[
- 	libwpg-0.2
-+])
-+
-+PKG_CHECK_MODULES([LCMS2],[
- 	lcms2
- ])
- 
-@@ -168,8 +174,10 @@
- ], [
- 	DEBUG_CXXFLAGS="-DNDEBUG"
- ])
--LIBCDR_CXXFLAGS="$LIBCDR_CFLAGS"
-+LIBCDR_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LCMS2_CFLAGS}"
-+LIBCDR_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LCMS2_LIBS}"
- AC_SUBST(LIBCDR_CXXFLAGS)
-+AC_SUBST(LIBCDR_LIBS)
- AC_SUBST(DEBUG_CXXFLAGS)
- 
- # ============