m4/mingw.m4 | 7 +++---- mythes/makefile.mk | 17 +++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-)
New commits: commit bcf1edba4eeecba9b47d3ef983e0973b4c737871 Author: David Tardon <[email protected]> Date: Mon Feb 20 14:25:34 2012 +0100 expect sed has already been detected Reportedly AC_PROG_SED does not exist on XCode 2.5 . diff --git a/m4/mingw.m4 b/m4/mingw.m4 index cd0f38f..952b2ed 100644 --- a/m4/mingw.m4 +++ b/m4/mingw.m4 @@ -1,9 +1,8 @@ # libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude]) -# uses: CC, WITH_MINGW +# uses: CC, SED, WITH_MINGW # -------------------------------------------------------------------- AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS], -[AC_REQUIRE([AC_PROG_SED])dnl -if test "$WITH_MINGW" = yes -a -n "$CC"; then +[if test "$WITH_MINGW" = yes -a -n "$CC"; then _libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib for _libo_mingw_lib in $1; do _libo_mingw_lib="$_libo_mingw_libdir/$_libo_mingw_lib.la" @@ -28,7 +27,7 @@ fi[]dnl ]) # libo_FIND_MINGW_EXTERNAL_DLLS # libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable]) -# uses: CC, WITH_MINGW +# uses: CC, SED, WITH_MINGW # -------------------------------------------------------- AC_DEFUN([libo_ADD_MINGW_EXTERNAL_DLLS], [libo_FIND_MINGW_EXTERNAL_DLLS([$1],[_libo_mingw_found_dlls],[$$2]) commit ad3b8a779db8f5ba908c59155328a4912ee0941d Author: David Tardon <[email protected]> Date: Sat Feb 18 14:07:27 2012 +0100 fix mingw build of mythes with system hunspell diff --git a/mythes/makefile.mk b/mythes/makefile.mk index 46520fc..44f8ba9 100644 --- a/mythes/makefile.mk +++ b/mythes/makefile.mk @@ -46,15 +46,15 @@ PATCH_FILES=\ mythes-1.2.0-makefile-mk.diff \ mythes-1.2.0-android.patch -.IF "$(GUI)"=="UNX" -CONFIGURE_DIR=$(BUILD_DIR) - -.IF "$(SYSTEM_MYTHES)" != "YES" - +.IF "$(COM)"=="GCC" .IF "$(SYSTEM_HUNSPELL)" != "YES" HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3 .ENDIF +.ENDIF + +.IF "$(GUI)"=="UNX" +CONFIGURE_DIR=$(BUILD_DIR) #relative to CONFIGURE_DIR # still needed also in system-mythes case as it creates the makefile @@ -86,17 +86,15 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff BUILD_ACTION=make OUT2INC += mythes.hxx -.ENDIF .ENDIF # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -.IF "$(SYSTEM_MYTHES)" != "YES" CONFIGURE_ACTION=configure CONFIGURE_FLAGS= --disable-shared --with-pic \ - HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \ - HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.3" + HUNSPELL_CFLAGS="$(HUNSPELL_CFLAGS)" \ + HUNSPELL_LIBS="$(HUNSPELL_LIBS)" .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no @@ -104,7 +102,6 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff BUILD_ACTION=make -.ENDIF .ELSE BUILD_ACTION=dmake .ENDIF # "$(COM)"=="GCC" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
