diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2014-06-11 22:35:25 +0200 |
---|---|---|
committer | Cedric BAIL <c.bail@partner.samsung.com> | 2014-06-12 03:12:56 +0200 |
commit | e4a74b17755dea099166ce9596c0c78a56a4ea0b (patch) | |
tree | a78f03986a4cc11dbc210a584cc1740b6dad25f8 /configure.ac | |
parent | a2a5274f8b46869fe9ede1c55490695426463040 (diff) |
backend: add default engine support for Windows and Mac OS X
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5693e9f93..046ec889f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -49,12 +49,14 @@ dnl managed by evil | |||
49 | dlopen_libs=-ldl | 49 | dlopen_libs=-ldl |
50 | requirement_elm="evil" | 50 | requirement_elm="evil" |
51 | have_socket="no" | 51 | have_socket="no" |
52 | default_engine=software_gdi | ||
52 | ;; | 53 | ;; |
53 | *solaris*) | 54 | *solaris*) |
54 | ELM_UNIX_DEF="#define" | 55 | ELM_UNIX_DEF="#define" |
55 | have_socket="yes" | 56 | have_socket="yes" |
56 | have_dlopen="yes" | 57 | have_dlopen="yes" |
57 | AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) | 58 | AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) |
59 | default_engine=software_x11 | ||
58 | ;; | 60 | ;; |
59 | darwin*) | 61 | darwin*) |
60 | ELM_UNIX_DEF="#define" | 62 | ELM_UNIX_DEF="#define" |
@@ -62,6 +64,7 @@ dnl managed by evil | |||
62 | have_dlopen="yes" | 64 | have_dlopen="yes" |
63 | AC_CHECK_HEADERS([crt_externs.h]) | 65 | AC_CHECK_HEADERS([crt_externs.h]) |
64 | AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."]) | 66 | AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."]) |
67 | default_engine=opengl_cocoa | ||
65 | ;; | 68 | ;; |
66 | *) | 69 | *) |
67 | ELM_UNIX_DEF="#define" | 70 | ELM_UNIX_DEF="#define" |
@@ -79,11 +82,16 @@ dnl managed by evil | |||
79 | fi | 82 | fi |
80 | fi | 83 | fi |
81 | have_socket="yes" | 84 | have_socket="yes" |
85 | default_engine=software_x11 | ||
82 | ;; | 86 | ;; |
83 | esac | 87 | esac |
88 | |||
84 | AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) | 89 | AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) |
85 | AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) | 90 | AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) |
86 | 91 | ||
92 | AC_SUBST([default_engine]) | ||
93 | AC_DEFINE_UNQUOTED([DEFAULT_ENGINE], ["$default_engine"], ["Default engine according to host"]) | ||
94 | |||
87 | m4_ifdef([v_mic], | 95 | m4_ifdef([v_mic], |
88 | [ | 96 | [ |
89 | EFL_COMPILER_FLAG([-Wshadow]) | 97 | EFL_COMPILER_FLAG([-Wshadow]) |
@@ -91,13 +99,9 @@ m4_ifdef([v_mic], | |||
91 | EFL_COMPILER_FLAG([-W]) | 99 | EFL_COMPILER_FLAG([-W]) |
92 | ]) | 100 | ]) |
93 | 101 | ||
94 | AC_LIBTOOL_WIN32_DLL | ||
95 | define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl | ||
96 | define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl | ||
97 | m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) | 102 | m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
98 | LT_INIT([win32-dll disable-static pic-only]) | 103 | LT_INIT([win32-dll disable-static pic-only]) |
99 | EFL_INIT | 104 | EFL_INIT |
100 | #AC_PROG_LIBTOOL | ||
101 | 105 | ||
102 | AC_GNU_SOURCE | 106 | AC_GNU_SOURCE |
103 | 107 | ||
@@ -681,8 +685,11 @@ data/desktop/Makefile | |||
681 | data/edje_externals/Makefile | 685 | data/edje_externals/Makefile |
682 | config/Makefile | 686 | config/Makefile |
683 | config/default/Makefile | 687 | config/default/Makefile |
688 | config/default/base.src | ||
684 | config/standard/Makefile | 689 | config/standard/Makefile |
690 | config/standard/base.src | ||
685 | config/mobile/Makefile | 691 | config/mobile/Makefile |
692 | config/mobile/base.src | ||
686 | $po_makefile_in | 693 | $po_makefile_in |
687 | cmakeconfig/ElementaryConfig.cmake | 694 | cmakeconfig/ElementaryConfig.cmake |
688 | cmakeconfig/ElementaryConfigVersion.cmake | 695 | cmakeconfig/ElementaryConfigVersion.cmake |