Attachment #402654 for bug #543954

Lines 14-19 if LIBRARIES_PSEH Link Here

(-)a/Makefile.am (-1 / +5 lines)
14	MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh	14	MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
15	endif	15	endif
16		16
		17	if LIBRARIES_WINPTHREADS
		18	MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
		19	endif
		20
17	if TOOLS_GENDEF	21	if TOOLS_GENDEF
18	MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef	22	MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
19	endif	23	endif
Lines 22-28 if TOOLS_GENIDL Link Here
22	MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl	26	MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
23	endif	27	endif
24		28
25	SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)	29	SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
26		30
27	DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all	31	DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all
28		32




AC_MSG_CHECKING([whether to build the optional libraries])
AC_ARG_WITH([libraries],
  [AS_HELP_STRING([--with-libraries=ARG],
    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
  [],
  [with_libraries=no])
AS_CASE([$with_libraries],
  [yes|all],[
    with_libraries="libmangle,pseh,winpthreads"
    with_libraries_pthreads=yes
    with_libraries_mangle=yes
    with_libraries_pseh=yes],
  [libmangle],[
    with_libraries="libmangle"
    with_libraries_pthreads=no
    with_libraries_mangle=yes
    with_libraries_pseh=no],
  [pseh],[
    with_libraries="pseh"
    with_libraries_pthreads=no
    with_libraries_mangle=no
    with_libraries_pseh=yes],
  [winpthreads],[
    with_libraries="winpthreads"
    with_libraries_winpthreads=yes
    with_libraries_mangle=no
    with_libraries_pseh=no],
  [no],[
    with_libraries_pthreads=no
    with_libraries_mangle=no
    with_libraries_pseh=no],
  [MW64_OPTION_ERROR([with-libraries])])
AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
AC_MSG_RESULT([$with_libraries])

AC_MSG_CHECKING([whether to build the optional tools])
- 

Return to bug 543954

Lines 53-82 AC_MSG_RESULT([$with_crt]) Link Here

(-)a/configure.ac (-3 / +13 lines)
53	AC_MSG_CHECKING([whether to build the optional libraries])	53	AC_MSG_CHECKING([whether to build the optional libraries])
54	AC_ARG_WITH([libraries],	54	AC_ARG_WITH([libraries],
55	[AS_HELP_STRING([--with-libraries=ARG],	55	[AS_HELP_STRING([--with-libraries=ARG],
56	[Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, 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	AS_CASE([$with_libraries],
60	[yes\|all],[	60	[yes\|all],[
61	with_libraries="libmangle,pseh"	61	with_libraries="libmangle,pseh,winpthreads"
		62	with_libraries_pthreads=yes
62	with_libraries_mangle=yes	63	with_libraries_mangle=yes
63	with_libraries_pseh=yes],	64	with_libraries_pseh=yes],
64	[libmangle],[	65	[libmangle],[
65	with_libraries="libmangle"	66	with_libraries="libmangle"
		67	with_libraries_pthreads=no
66	with_libraries_mangle=yes	68	with_libraries_mangle=yes
67	with_libraries_pseh=no],	69	with_libraries_pseh=no],
68	[pseh],[	70	[pseh],[
69	with_libraries="pseh"	71	with_libraries="pseh"
		72	with_libraries_pthreads=no
70	with_libraries_mangle=no	73	with_libraries_mangle=no
71	with_libraries_pseh=yes],	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],
72	[no],[	80	[no],[
		81	with_libraries_pthreads=no
73	with_libraries_mangle=no	82	with_libraries_mangle=no
74	with_libraries_pseh=no],	83	with_libraries_pseh=no],
75	[MW64_OPTION_ERROR([with-libraries])])	84	[MW64_OPTION_ERROR([with-libraries])])
76	AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])	85	AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
77	AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])	86	AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
		87	AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
78	AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])	88	AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
79	AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])	89	AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
		90	AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
80	AC_MSG_RESULT([$with_libraries])	91	AC_MSG_RESULT([$with_libraries])
81		92
82	AC_MSG_CHECKING([whether to build the optional tools])	93	AC_MSG_CHECKING([whether to build the optional tools])
83	-