diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-20 13:15:23 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-20 13:18:59 +0100 |
| commit | 039a1dcc9fe2af4d48bd931a4c937d502a046797 (patch) | |
| tree | a526cf45d227223e2a0ff990de54bfec905d5405 | |
| parent | e0202de07e9cf078011d580aacebf98bae58782d (diff) | |
configure: fix WPD/WPS/WPG when no explicit option given:
Consistently set WPD_CFLAGS/WPD_LIBS etc. in that case, with luck not
breaking anything else in the process due to newly set FOO_CFLAGS/LIBS.
Change-Id: I56bc6b86821b77c0c376d06b629646ada1ea0339
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | m4/libo_externals.m4 | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index ffdd3eea4b26..97365f99374c 100644 --- a/configure.ac +++ b/configure.ac @@ -7287,11 +7287,7 @@ dnl =================================================================== if test $_os = iOS; then libo_PUBLISH_MODULE([WPD]) else - if test "$with_system_libwpd" = "no"; then - WPD_CFLAGS="-I${OUTDIR}/inc/external" - WPD_LIBS="-L${OUTDIR}/lib -lwpdlib" - fi - libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9]) + libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpdlib"]) fi dnl =================================================================== @@ -7337,11 +7333,7 @@ dnl =================================================================== if test $_os = iOS; then libo_PUBLISH_MODULE([WPS]) else - if test "$with_system_libwps" = "no"; then - WPS_CFLAGS="-I${OUTDIR}/inc/external" - WPS_LIBS="-L${OUTDIR}/lib -lwpslib" - fi - libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2]) + libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpslib"]) fi dnl =================================================================== @@ -7350,11 +7342,7 @@ dnl =================================================================== if test $_os = iOS; then libo_PUBLISH_MODULE([WPG]) else - if test "$with_system_libwpg" = "no"; then - WPG_CFLAGS="-I${OUTDIR}/inc/external" - WPG_LIBS="-L${OUTDIR}/lib -lwpglib" - fi - libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2]) + libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpglib"]) fi dnl =================================================================== diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index b0b45ed4e6a0..2b142b5281c9 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -23,6 +23,8 @@ if test "$with_system_$1" = "yes"; then else AC_MSG_RESULT([internal]) SYSTEM_$2=NO + $2_CFLAGS=$4 + $2_LIBS=$5 BUILD_TYPE="$BUILD_TYPE $2" fi libo_PUBLISH_MODULE([$2]) |