Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 543954 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-44 / +12 lines)
Lines 56-87 AC_ARG_WITH([libraries], Link Here
56
    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
56
    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
57
  [],
57
  [],
58
  [with_libraries=no])
58
  [with_libraries=no])
59
AS_CASE([$with_libraries],
59
for l in winpthreads mangle pseh; do
60
  [yes|all],[
60
  res=`echo "${with_libraries}" | grep $l > /dev/null && echo yes || echo no`
61
    with_libraries="libmangle,pseh,winpthreads"
61
  AS_CASE([$with_libraries],
62
    with_libraries_winpthreads=yes
62
    [all|yes],[res=yes])
63
    with_libraries_mangle=yes
63
    AS_VAR_COPY([with_libraries_$l], [res])
64
    with_libraries_pseh=yes],
64
done
65
  [libmangle],[
66
    with_libraries="libmangle"
67
    with_libraries_winpthreads=no
68
    with_libraries_mangle=yes
69
    with_libraries_pseh=no],
70
  [pseh],[
71
    with_libraries="pseh"
72
    with_libraries_winpthreads=no
73
    with_libraries_mangle=no
74
    with_libraries_pseh=yes],
75
  [winpthreads],[
76
    with_libraries="winpthreads"
77
    with_libraries_winpthreads=yes
78
    with_libraries_mangle=no
79
    with_libraries_pseh=no],
80
  [no],[
81
    with_libraries_winpthreads=no
82
    with_libraries_mangle=no
83
    with_libraries_pseh=no],
84
  [MW64_OPTION_ERROR([with-libraries])])
85
AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
65
AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
86
AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
66
AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
87
AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
67
AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
Lines 96-118 AC_ARG_WITH([tools], Link Here
96
    [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
76
    [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
97
  [],
77
  [],
98
  [with_tools=no])
78
  [with_tools=no])
99
AS_CASE([$with_tools],
79
for t in gendef genidl; do
100
  [yes|all],[
80
  res=`echo "${with_tools}" | grep $t > /dev/null && echo yes || echo no`
101
    with_tools="gendef,genidl"
81
  AS_CASE([$with_tools],
102
    with_tools_gendef=yes
82
    [all|yes],[res=yes])
103
    with_tools_genidl=yes],
83
    AS_VAR_COPY([with_tools_$t], [res])
104
  [gendef],[
84
done
105
    with_tools="gendef"
106
    with_tools_gendef=yes
107
    with_tools_genidl=no],
108
  [genidl],[
109
    with_tools="genidl"
110
    with_tools_gendef=no
111
    with_tools_genidl=yes],
112
  [no],[
113
    with_tools_gendef=no
114
    with_tools_genidl=no],
115
  [MW64_OPTION_ERROR([with-tools])])
116
AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
85
AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
117
AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
86
AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
118
AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
87
AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
119
- 

Return to bug 543954