summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-11 17:44:59 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-11 17:44:59 +0000
commitd2d31d5d5603dd24c4f1ea52c137ffab7218eea6 (patch)
tree818f8415029e066d0da1b74e7f382cd4cb9722bc /configure.ac
parent37cfda6c1412ce5decb302b3739e6bc639783e2a (diff)
merge: evil compile
SVN revision: 76471
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 7aa0a78875..fee52f4e86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,7 +248,7 @@ case "$host_os" in
248 EVIL_DLFCN_LIBS="-ltoolhelp" 248 EVIL_DLFCN_LIBS="-ltoolhelp"
249 ;; 249 ;;
250 *) 250 *)
251 EVIL_LIBS="-lole32 -lws2_32 -lsecur32" 251 EVIL_LIBS="-luuid -lole32 -lws2_32 -lsecur32"
252 EVIL_DLFCN_LIBS="-lpsapi" 252 EVIL_DLFCN_LIBS="-lpsapi"
253 ;; 253 ;;
254esac 254esac
@@ -267,6 +267,7 @@ AC_CHECK_HEADERS([errno.h])
267### Checks for compiler characteristics 267### Checks for compiler characteristics
268 268
269EVIL_CPPFLAGS="-DEFL_EVIL_BUILD" 269EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
270EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
270EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields" 271EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields"
271EVIL_CXXFLAGS="" 272EVIL_CXXFLAGS=""
272 273
@@ -276,6 +277,7 @@ if test "x${have_win32}" = "xyes" ; then
276fi 277fi
277 278
278AC_SUBST([EVIL_CPPFLAGS]) 279AC_SUBST([EVIL_CPPFLAGS])
280AC_SUBST([EVIL_DLFCN_CPPFLAGS])
279AC_SUBST([EVIL_CFLAGS]) 281AC_SUBST([EVIL_CFLAGS])
280AC_SUBST([EVIL_CXXFLAGS]) 282AC_SUBST([EVIL_CXXFLAGS])
281 283
@@ -313,6 +315,7 @@ src/bin/Makefile
313src/bin/evil/Makefile 315src/bin/evil/Makefile
314src/lib/Makefile 316src/lib/Makefile
315src/lib/evil/Makefile 317src/lib/evil/Makefile
318evil.pc
316]) 319])
317 320
318AC_OUTPUT 321AC_OUTPUT