>From 7385fa2d73e13e94988da8c5eb17ecd7fd590c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20R=C3=B8nne?= Date: Mon, 23 Aug 2010 22:00:36 +0200 Subject: [PATCH 2/6] Update configure.ac to detect OpenWatcom. Added some checks for the wcc and wlink command expected to be in the OpenWatcom package. The commands need to be in PATH to be found. If wcc is found the flags needed for DOS building is defined. --- configure.ac | 54 ++++++++++++++++-------------------------------------- 1 files changed, 16 insertions(+), 38 deletions(-) diff --git a/configure.ac b/configure.ac index b02c7aa..0d4fc04 100644 --- a/configure.ac +++ b/configure.ac @@ -4,8 +4,8 @@ dnl See ChangeLog file for detailed change history. m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1])) -dnl autoconf versions before 2.62 don't handle source dir symlinks correctly -AC_PREREQ(2.62) +dnl autoconf versions before 2.59d don't handle multi-line subst variables correctly +AC_PREREQ(2.59d) AC_INIT([Wine],[WINE_VERSION],[wine-devel@winehq.org],[wine],[http://www.winehq.org]) AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) @@ -55,8 +55,6 @@ AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (sch AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]), [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) -AC_ARG_WITH(icns, AS_HELP_STRING([--without-icns],[do not use ICNS icon support]), - [if test "x$withval" = "xno"; then ac_cv_header_icns_h=no; fi]) AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]), [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi]) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]), @@ -290,6 +288,8 @@ AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false) AC_CHECK_PROGS(RSVG, rsvg, false) AC_CHECK_PROGS(CONVERT, convert, false) AC_CHECK_PROGS(ICOTOOL, icotool, false) +AC_CHECK_PROGS(WCC, wcc, false) +AC_CHECK_PROGS(WLINK, wlink, false) if test "x$enable_maintainer_mode" != "xyes" then @@ -350,6 +350,18 @@ else fi +if test "x$enable_win16" = "xyes" -a "x$enable_tests" != "xno" +then + case "$WCC" in + false) + WINE_NOTICE([OpenWatcom compiler not found. Unable to create DOS/Win 3 programs for testing, so those tests will be skipped.]) + ;; + *) + AC_SUBST(WCC_DOS_FLAGS, "-bt=DOS -ml -zq") + ;; + esac +fi + case $host_cpu in *i[[3456789]]86*) AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) @@ -398,7 +410,6 @@ AC_CHECK_HEADERS(\ grp.h \ gsm.h \ gsm/gsm.h \ - icns.h \ ieeefp.h \ inet/mib2.h \ io.h \ @@ -1490,17 +1501,6 @@ fi WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.]) -dnl **** Check for libicns **** -if test "$ac_cv_header_icns_h" = "yes" -then - WINE_CHECK_SONAME(icns,icns_write_family_to_file) -fi -case $host_os in - darwin*|macosx*) - WINE_NOTICE_WITH(icns,[test "x$ac_cv_lib_soname_icns" = "x"], - [libicns ${notice_platform}development files not found, ICNS icons won't be supported.]) ;; -esac - dnl **** Check for libjpeg **** if test "$ac_cv_header_jpeglib_h" = "yes" then @@ -2306,32 +2306,12 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) -WINE_CONFIG_DLL(d3dcompiler_33) -WINE_CONFIG_DLL(d3dcompiler_34) -WINE_CONFIG_DLL(d3dcompiler_35) -WINE_CONFIG_DLL(d3dcompiler_36) -WINE_CONFIG_DLL(d3dcompiler_37) -WINE_CONFIG_DLL(d3dcompiler_38) -WINE_CONFIG_DLL(d3dcompiler_39) -WINE_CONFIG_DLL(d3dcompiler_40) WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) -WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dim,,[d3dim]) WINE_CONFIG_DLL(d3drm,,[d3drm]) WINE_CONFIG_TEST(dlls/d3drm/tests) -WINE_CONFIG_DLL(d3dx10_33) -WINE_CONFIG_DLL(d3dx10_34) -WINE_CONFIG_DLL(d3dx10_35) -WINE_CONFIG_DLL(d3dx10_36) -WINE_CONFIG_DLL(d3dx10_37) -WINE_CONFIG_DLL(d3dx10_38) -WINE_CONFIG_DLL(d3dx10_39) -WINE_CONFIG_DLL(d3dx10_40) -WINE_CONFIG_DLL(d3dx10_41) -WINE_CONFIG_DLL(d3dx10_42) -WINE_CONFIG_DLL(d3dx10_43) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) WINE_CONFIG_DLL(d3dx9_26) @@ -2372,7 +2352,6 @@ WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband) WINE_CONFIG_DLL(dmcompos) WINE_CONFIG_DLL(dmime) -WINE_CONFIG_TEST(dlls/dmime/tests) WINE_CONFIG_DLL(dmloader) WINE_CONFIG_TEST(dlls/dmloader/tests) WINE_CONFIG_DLL(dmscript) @@ -2774,7 +2753,6 @@ WINE_CONFIG_PROGRAM(extrac32,install) WINE_CONFIG_PROGRAM(hh,install) WINE_CONFIG_PROGRAM(icinfo,install) WINE_CONFIG_PROGRAM(iexplore,install) -WINE_CONFIG_PROGRAM(ipconfig,install) WINE_CONFIG_PROGRAM(lodctr,install) WINE_CONFIG_PROGRAM(mshta,install) WINE_CONFIG_PROGRAM(msiexec,installbin) -- 1.7.0.4