diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-16 14:50:19 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-16 20:24:23 +0200 |
| commit | a420516af36b3c7b6b657ffdef8cb0ef0a6ae1b4 (patch) | |
| tree | e47a77a82e5ce5c941c31ed4951f8a9c943698bf | |
| parent | afbc8993bdff272eb6712333c89715c9a1de0533 (diff) | |
mingw: unbreak make check
Even if it does nothing because there is no installation available .-)
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/msiglobal.pm | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 8ad7f5c53d04..fe5fc878e7b4 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -525,6 +525,7 @@ export UPD=@UPD@ export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@ export use_shl_version=@use_shl_version@ export USE_XINERAMA=@USE_XINERAMA@ +export UUIDGEN=@UUIDGEN@ export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@ export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@ export VERBOSE=@VERBOSE@ diff --git a/configure.in b/configure.in index 624464a48f67..1792d2b29ea4 100644 --- a/configure.in +++ b/configure.in @@ -8160,6 +8160,22 @@ fi AC_SUBST(WINDOWS_SDK_HOME) dnl ========================================= +dnl Check for uuidgen +dnl ========================================= +if test "$_os" = "WINNT"; then + if test "$WITH_MINGW" = "yes"; then + AC_PATH_PROG([UUIDGEN], [uuid]) + if test -z "$UUIDGEN"; then + AC_MSG_ERROR([uuid is needed for dev-install]) + fi + else + # presence is already tested above in the WINDOWS_SDK_HOME check + UUIDGEN=uuidgen.exe + AC_SUBST(UUIDGEN) + fi +fi + +dnl ========================================= dnl Check for the Microsoft DirectX SDK. dnl ========================================= if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 52711c698874..c6a70ff7dd2d 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -1266,7 +1266,7 @@ sub get_guid_list if ( $log ) { installer::logger::include_header_into_logfile("Generating $number GUID"); } - my $uuidgen = "uuidgen.exe"; # Has to be in the path + my $uuidgen = $ENV{'UUIDGEN'}; # Has to be in the path # "-c" for uppercase output |