summaryrefslogtreecommitdiff
path: root/legacy/evil/configure.ac
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-12-16 17:50:13 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-12-16 17:50:13 +0000
commitb21fb2cb051cbd5a20f661959517a16ac74f3960 (patch)
treef12cd746d510e91d4714e6788c00afea62ac054a /legacy/evil/configure.ac
parent28aec29e9f1e75aa2aeec9435772d2ec22c16aac (diff)
Evil: organize the m4 files in common and "private" dirs, remove mpatrol, add a "windows-version" option to configure
SVN revision: 66293
Diffstat (limited to '')
-rw-r--r--legacy/evil/configure.ac14
1 files changed, 9 insertions, 5 deletions
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index cd47b7b2f3..dcc438a961 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -54,6 +54,11 @@ version_info="lt_cur:lt_rev:lt_age"
54AC_SUBST(version_info) 54AC_SUBST(version_info)
55 55
56 56
57### Needed information
58
59EFL_SELECT_WINDOWS_VERSION()
60
61
57### Checks for programs 62### Checks for programs
58AM_PROG_AS 63AM_PROG_AS
59AC_PROG_CXX 64AC_PROG_CXX
@@ -83,8 +88,6 @@ esac
83AC_SUBST([win32_libs]) 88AC_SUBST([win32_libs])
84AC_SUBST([win32_dl_libs]) 89AC_SUBST([win32_dl_libs])
85 90
86EFL_CHECK_MPATROL([have_mpatrol="yes"], [have_mpatrol="no"])
87
88 91
89### Checks for header files 92### Checks for header files
90AC_CHECK_HEADERS([errno.h]) 93AC_CHECK_HEADERS([errno.h])
@@ -98,7 +101,7 @@ AC_CHECK_HEADERS([errno.h])
98 101
99### Checks for compiler characteristics 102### Checks for compiler characteristics
100AC_C_CONST 103AC_C_CONST
101AC_C___ATTRIBUTE__ 104EFL_ATTRIBUTE_UNUSED
102 105
103win32_cppflags="-DEFL_EVIL_BUILD" 106win32_cppflags="-DEFL_EVIL_BUILD"
104win32_cflags="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" 107win32_cflags="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
@@ -107,12 +110,12 @@ have_wince="no"
107case "$host_os" in 110case "$host_os" in
108 mingw32ce*) 111 mingw32ce*)
109 have_wince="yes" 112 have_wince="yes"
110 win32_cppflags="${win32_cppflags} -D_WIN32_WCE=0x0420" 113 win32_cppflags="${win32_cppflags}"
111 ;; 114 ;;
112 *) 115 *)
113 have_wince="no" 116 have_wince="no"
114 win32_cxxflags="-fno-rtti -fno-exceptions" 117 win32_cxxflags="-fno-rtti -fno-exceptions"
115 win32_cppflags="${win32_cppflags} -D_WIN32_WINNT=0x0501 -DSECURITY_WIN32" 118 win32_cppflags="${win32_cppflags} -DSECURITY_WIN32"
116 ;; 119 ;;
117esac 120esac
118AC_SUBST([win32_cppflags]) 121AC_SUBST([win32_cppflags])
@@ -154,6 +157,7 @@ echo
154echo "Configuration Options Summary:" 157echo "Configuration Options Summary:"
155echo 158echo
156echo " OS...................: ${host_os}" 159echo " OS...................: ${host_os}"
160echo " Windows version......: ${_efl_windows_version}"
157echo 161echo
158echo " Documentation........: ${build_doc}" 162echo " Documentation........: ${build_doc}"
159echo " Mpatrol..............: ${have_mpatrol}" 163echo " Mpatrol..............: ${have_mpatrol}"