diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-01 10:17:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-02 08:02:21 +0100 |
| commit | 2195299ab60d71a72c37690f88575f71b3d568ff (patch) | |
| tree | 0083546b4d886ad1330ffcc91e40c4153b4ff96e | |
| parent | c4688ad97e4b5f1c0e7fd94937013ddc1c868139 (diff) | |
Where to find ATL files doesn't depend on --enable-activex
...but, according to the 'Doesn't exist for VSE' comment, apparently rather on the
compiler version installed
Change-Id: I49a87fa55facee8ee66e2b44d7090d06fb104b89
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index d180f82888bd..b97442fc5259 100644 --- a/configure.ac +++ b/configure.ac @@ -12809,12 +12809,12 @@ AC_MSG_NOTICE([setting up the build environment variables...]) AC_SUBST(COMPATH) if test "$build_os" = "cygwin"; then - if test "$DISABLE_ACTIVEX" = "TRUE"; then - ATL_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE - ATL_INCLUDE="$WINDOWS_SDK_HOME/include/atl" - else + if test -d "$COMPATH/atlmfc/lib"; then ATL_LIB="$COMPATH/atlmfc/lib" ATL_INCLUDE="$COMPATH/atlmfc/include" + else + ATL_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE + ATL_INCLUDE="$WINDOWS_SDK_HOME/include/atl" fi if test "$BITNESS_OVERRIDE" = 64; then ATL_LIB="$ATL_LIB/amd64" |