Kaydet (Commit) 8bf3faf9 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Don't patch configure.ac not to run autotools ever during build

Change-Id: Ib481a70fdb67fcec1b72762c408b27f854fe4d1a
üst 12decfc3
diff -u cdr.old/configure cdr/configure --- cdr/configure 2012-10-05 21:47:11.246958344 +0200
--- cdr.old/configure 2012-10-05 21:47:11.246958344 +0200
+++ cdr/configure 2012-10-05 22:05:33.913874511 +0200 +++ cdr/configure 2012-10-05 22:05:33.913874511 +0200
@@ -637,6 +617,7 @@ @@ -637,6 +617,7 @@
DOXYGEN DOXYGEN
...@@ -431,36 +430,3 @@ diff -u cdr.old/configure cdr/configure ...@@ -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)
# ============
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment