← Back to branch summary

~steve-sk2/mingw-w64/oneiric

« back to all changes in this revision

Viewing changes to mingw-w64-crt/configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Stephen Kitt
  • Date: 2010-11-18 00:04:46 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101118000446-xe24b423su55onyl
Tags: 1.0+20101003-1
http://bugs.debian.org/594371
http://bugs.debian.org/569914
http://bugs.debian.org/600451
* New maintainer. (Closes: #594371.)
* New upstream snapshot:
  - Includes getopt.h. (Closes: #569914.)
* Build g++ for Win64. (Closes: #600451.)
* Standards-Version 3.9.1 (new packaging).
* Include patch from
  http://mingw-w64.svn.sourceforge.net/viewvc/mingw-w64?view=revision&revision=3715
  as suggested by Rafaël Carré.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mingw-w64-crt/configure.ac
8
8
AC_CONFIG_SRCDIR([ChangeLog])
9
9
AC_CONFIG_HEADER([config.h])
10
10
 
 
11
AM_INIT_AUTOMAKE([foreign subdir-objects])
11
12
AM_MAINTAINER_MODE
12
 
AM_INIT_AUTOMAKE([foreign subdir-objects])
13
13
 
14
14
AC_CANONICAL_HOST
15
15
 
39
39
    TARGET_SYSTEM_ROOT=
40
40
    with_sysroot=no
41
41
  ])
42
 
AM_CONDITIONAL(WITHSYSROOT, test $with_sysroot != no)
43
 
AC_SUBST(TARGET_SYSTEM_ROOT)
 
42
AM_CONDITIONAL([WITHSYSROOT],[test $with_sysroot != no])
 
43
AC_SUBST([TARGET_SYSTEM_ROOT])
44
44
 
45
45
# Checks for programs.
46
46
# Checks for headers, libs, etc need to utilize the sysroot... no idea how
49
49
AC_PROG_CC
50
50
AC_PROG_CXX
51
51
AC_PROG_INSTALL
52
 
AC_LIBTOOL_WIN32_DLL
53
 
AC_DISABLE_STATIC
54
 
AC_PROG_LIBTOOL
 
52
AC_PROG_RANLIB
 
53
AC_CHECK_TOOL([DLLTOOL], [dlltool], [:])
55
54
AM_PROG_AS
 
55
dnl Remove these once automake fixes the bug where they aren't defined according to $host
 
56
AC_CHECK_TOOL([AR], [ar], [:])
 
57
AC_CHECK_TOOL([AS], [as], [:])
 
58
dnl ---
56
59
AM_PROG_CC_C_O
57
60
 
58
61
AC_ARG_ENABLE([lib32],
59
62
  [AS_HELP_STRING([--enable-lib32],
60
 
    [enable compiling the Win32 runtime])],
 
63
    [Build the Win32 runtime])],
61
64
  [],
62
65
  [AC_MSG_CHECKING([whether to build the Win32 runtime])
63
66
   _save_CFLAGS="$CFLAGS"
76
79
 
77
80
AC_ARG_ENABLE([lib64],
78
81
  [AS_HELP_STRING([--enable-lib64],
79
 
    [enable compiling the Win64 runtime])],
 
82
    [Build the Win64 runtime])],
80
83
  [],
81
84
  [AC_MSG_CHECKING([whether to build the Win64 runtime])
82
85
   _save_CFLAGS="$CFLAGS"
95
98
 
96
99
AC_ARG_ENABLE([libce],
97
100
  [AS_HELP_STRING([--enable-libce],
98
 
    [enable compiling the WinCE runtime])],
 
101
    [Build the WinCE runtime])],
99
102
  [],
100
103
  [AS_CASE([$host_cpu],
101
 
    [arm*],
102
 
      [enable_libce=yes],
103
 
    [*],
104
 
      [enable_libce=no])
 
104
    [arm*],[enable_libce=yes],
 
105
    [*],[enable_libce=no])
105
106
  ])
106
107
AM_CONDITIONAL([LIBCE], [test $enable_libce = yes])
107
108
 
124
125
 
125
126
# Checks for features.
126
127
 
127
 
AC_ARG_ENABLE(
128
 
  wildcard,
129
 
  AC_HELP_STRING([--enable-wildcard], [Enable command line globbing [[default=no]]]),
 
128
AC_ARG_ENABLE([wildcard],
 
129
  [AS_HELP_STRING([--enable-wildcard],
 
130
    [Enable command line globbing @<:@default=no@:>@])],
130
131
  [],
131
 
  [enable_wildcard=no]
132
 
)
133
 
AS_IF(
134
 
  [test x$enable_wildcard = xyes],
135
 
  [AC_DEFINE(__ENABLE_GLOBBING,-1, [Define as -1 if want to enable command line globbing, 0 otherwise])],
136
 
  [AC_DEFINE(__ENABLE_GLOBBING, 0, [Define as -1 if want to enable command line globbing, 0 otherwise])]
137
 
)
 
132
  [enable_wildcard=no])
 
133
AS_CASE([$enable_wildcard],
 
134
  [yes],[enable_wildcard_value=-1],
 
135
  [no],[enable_wildcard_value=0],
 
136
  [AC_MSG_ERROR([Please only use --enable-wildcard or --disable-wildcard, without any additional arguments.])])
 
137
AC_DEFINE_UNQUOTED([__ENABLE_GLOBBING],[$enable_wildcard_value],[Define as -1 to enable command line globbing or 0 to disable it.])
 
138
 
 
139
AC_MSG_CHECKING([whether the compiler supports -municode])
 
140
AC_ARG_ENABLE([tests-unicode],
 
141
  [AS_HELP_STRING([--enable-tests-unicode],
 
142
    [Enable the unicode testsuite without testing the compiler for support.])],
 
143
  [],[
 
144
    saved_CFLAGS="$CFLAGS"
 
145
    CFLAGS="$CFLAGS -municode"
 
146
    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 
147
#ifndef UNICODE
 
148
# error UNICODE not defined with -municode
 
149
#endif
 
150
    ]])],
 
151
    [enable_tests_unicode=yes],
 
152
    [enable_tests_unicode=no])
 
153
    CFLAGS="$saved_CFLAGS"])
 
154
AM_CONDITIONAL([ENABLE_TESTS_UNICODE],[test x$enable_tests_unicode = xyes])
 
155
AC_MSG_RESULT([$enable_tests_unicode])
138
156
 
139
157
# Checks for libraries.
140
158