diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-07-23 18:16:46 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-07-24 13:42:51 +0200 |
| commit | 063afe5104a4db1d97a3bcaa215f5fe87698ed70 (patch) | |
| tree | da75ee3a9170cca833f569f56d4624ce72ab9809 /configure.in | |
| parent | 67e3e8bdb42603261de7b9e4b21dd0846d6ae6d5 (diff) | |
Check for the msi* build requirements in configure.in + update README.cross.
Change-Id: I0da3e604ebd0665c5405174957d852677195126b
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 264c6c600320..73f07d0969a5 100644 --- a/configure.in +++ b/configure.in @@ -74,8 +74,6 @@ else fi AC_SUBST(CROSS_COMPILING) -AC_PATH_PROG(WINEGCC, winegcc) - AC_PROG_EGREP # AC_PROG_EGREP doesn't set GREP on all systems as well AC_PATH_PROG(GREP, grep) @@ -2366,6 +2364,24 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then AC_PROG_CC fi +dnl We need winegcc when building MinGW build to be able to cross-build msi tools +AC_PATH_PROG(WINEGCC, winegcc) +if test "$WITH_MINGW" = "yes" ; then + if test "$WINEGCC" = ""; then + AC_MSG_ERROR([winegcc was not found, please install wine-devel, or wine-devel-32bit]) + fi + CC_save="$CC" + CC="$WINEGCC -m32" + AC_LINK_IFELSE([AC_LANG_PROGRAM([ +#include <stdio.h> + ],[ +printf ("hello world\n"); + ])],, + [AC_MSG_ERROR([winegcc cannot build 32bit binaries, please install glibc-devel-32bit and gcc-32bit])] + ) + CC="$CC_save" +fi + COMPATH=`dirname "$CC"` if test "$COMPATH" = "."; then AC_PATH_PROGS(COMPATH, $CC) |