summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2015-12-28 14:22:29 +0100
committerJean-Philippe Andre <jp.andre@samsung.com>2015-12-29 22:13:58 +0900
commit47ed848a8795c1b044f8be0dc6fb455f8bc13706 (patch)
tree758f9d41dbe0a4fb69a544d4bc1cea31421f6c38 /configure.ac
parent2ac9e788c689f2ca850d373a19a9e85237198573 (diff)
Evil: integrate the dlfcn code into Evil
This will remove some incompatibilities with other packages, especially for win-builds
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 3 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 6e5953b..a7f97c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -714,8 +714,6 @@ fi
714AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"]) 714AM_CONDITIONAL([WANT_SYSTEMD], [test "${want_systemd}" = "yes"])
715AM_CONDITIONAL([HAVE_SYSTEMD], [test "${want_systemd}" = "yes" -a "${have_systemd_pkg}" = "yes"]) 715AM_CONDITIONAL([HAVE_SYSTEMD], [test "${want_systemd}" = "yes" -a "${have_systemd_pkg}" = "yes"])
716#### Platform-dependent 716#### Platform-dependent
717DL_LIBS=""
718DL_INTERNAL_LIBS=""
719 717
720#### Evil 718#### Evil
721EFL_LIB_START_OPTIONAL([Evil], [test "${have_windows}" = "yes"]) 719EFL_LIB_START_OPTIONAL([Evil], [test "${have_windows}" = "yes"])
@@ -729,10 +727,7 @@ EFL_SELECT_WINDOWS_VERSION
729 727
730### Checks for libraries 728### Checks for libraries
731 729
732EFL_ADD_LIBS([EVIL], [-lole32 -lws2_32 -lsecur32 -luuid]) 730EFL_ADD_LIBS([EVIL], [-lpsapi -lole32 -lws2_32 -lsecur32 -luuid])
733EVIL_DLFCN_LIBS="-lpsapi"
734
735AC_SUBST([EVIL_DLFCN_LIBS])
736 731
737### Checks for header files 732### Checks for header files
738 733
@@ -742,7 +737,7 @@ AC_SUBST([EVIL_DLFCN_LIBS])
742 737
743### Checks for compiler characteristics 738### Checks for compiler characteristics
744 739
745EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1" 740EVIL_CPPFLAGS="-DPSAPI_VERSION=1"
746# TODO: should we have these at EFL (global?) 741# TODO: should we have these at EFL (global?)
747# Note: these warnings should not be used with C++ code 742# Note: these warnings should not be used with C++ code
748EVIL_CFLAGS_WRN="-Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" 743EVIL_CFLAGS_WRN="-Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
@@ -753,7 +748,7 @@ if test "x${have_win32}" = "xyes" ; then
753 EVIL_CXXFLAGS="-fno-rtti -fno-exceptions -DSECURITY_WIN32 ${EVIL_CXXFLAGS}" 748 EVIL_CXXFLAGS="-fno-rtti -fno-exceptions -DSECURITY_WIN32 ${EVIL_CXXFLAGS}"
754fi 749fi
755 750
756AC_SUBST([EVIL_DLFCN_CPPFLAGS]) 751AC_SUBST([EVIL_CPPFLAGS])
757AC_SUBST([EVIL_CFLAGS_WRN]) 752AC_SUBST([EVIL_CFLAGS_WRN])
758AC_SUBST([EVIL_CXXFLAGS]) 753AC_SUBST([EVIL_CXXFLAGS])
759 754
@@ -761,9 +756,6 @@ AC_SUBST([EVIL_CXXFLAGS])
761 756
762### Checks for library functions 757### Checks for library functions
763 758
764DL_LIBS="lib/evil/libdl.la"
765DL_INTERNAL_LIBS="lib/evil/libdl.la"
766
767EFL_LIB_END_OPTIONAL([Evil]) 759EFL_LIB_END_OPTIONAL([Evil])
768 760
769AC_SUBST([USE_EVIL_CFLAGS]) 761AC_SUBST([USE_EVIL_CFLAGS])