From: cedric Date: Mon, 8 Aug 2011 08:06:38 +0000 (+0000) Subject: evas: fix static build of software xlib and xcb engine. X-Git-Tag: submit/trunk/20120815.174732~1027 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f409145e185767e6cedf698b3b7d681a6eec3a4;p=profile%2Fivi%2Fevas.git evas: fix static build of software xlib and xcb engine. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@62194 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/configure.ac b/configure.ac index 565feb0..9e5cb07 100644 --- a/configure.ac +++ b/configure.ac @@ -734,9 +734,6 @@ if test "x$want_xcb" != "xno" ; then have_evas_engine_software_x11="yes" AC_DEFINE_UNQUOTED(BUILD_ENGINE_SOFTWARE_X11, [1], [Build software X11 engine]) AC_DEFINE_UNQUOTED(BUILD_ENGINE_SOFTWARE_XCB, [1], [Build software XCB backend]) - if test "x$have_evas_engine_software_xcb" = "xstatic" ; then - AC_DEFINE_UNQUOTED(EVAS_STATIC_BUILD_SOFTWARE_XCB, [1], [Build software X11 engine as part of libevas]) - fi fi else AC_MSG_RESULT(no) @@ -752,14 +749,15 @@ if test "x$build_software_xcb" = "xno" ; then have_evas_engine_software_x11="yes" AC_DEFINE_UNQUOTED(BUILD_ENGINE_SOFTWARE_X11, [1], [Build software X11 engine]) AC_DEFINE_UNQUOTED(BUILD_ENGINE_SOFTWARE_XLIB, [1], [Build software Xlib backend]) - if test "x$have_evas_engine_software_xlib" = "xstatic" ; then - AC_DEFINE_UNQUOTED(EVAS_STATIC_BUILD_SOFTWARE_XLIB, [1], [Build software X11 engine as part of libevas]) - fi fi else have_evas_engine_software_xlib="no" fi +if test "x$have_evas_engine_software_xlib" = "xstatic" -o "x$have_evas_engine_software_xcb" = "xstatic"; then + AC_DEFINE_UNQUOTED(EVAS_STATIC_BUILD_SOFTWARE_X11, [1], [Build software X11 engine as part of libevas]) +fi + AC_SUBST(have_evas_engine_software_xcb) AC_SUBST(have_evas_engine_software_xlib)