diff options
| author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-09 16:48:40 +0000 |
|---|---|---|
| committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-09 16:48:40 +0000 |
| commit | 57090b2abbb9dea419c99c5ce33a48e07ec33725 (patch) | |
| tree | c5f6dd8cf2883a413994f0be2c6fb5df2b2d0c3f /src/Makefile_Evas.am | |
| parent | f0a7a2a75170043bb3c44e511cc3558dc585293c (diff) | |
| download | efl-57090b2abbb9dea419c99c5ce33a48e07ec33725.tar.gz | |
efl: improve X detection by Joel Klinghed.
* Split out ecore_imf_xim to do its own check
* Fixed problem with xcb's makekeys, no rule for
$(top_builddir)/src/utils/ecore/makekeys$(EXEEXT) exists so make
used an implicit rule (ignoring any cflags of course)
* Fixed gl_x11 engine to build with either Xlib or XCB (xcb flags were
missing)
* Added EFL_FIND_X and replace any used of AC_PATH_X{,TRA}. First
looks for Xorg pkg-config files then if those arn't found it falls
back to old AC_PATH_X. Also generalized common header and lib
checks. Could probably use some polishing (the AC_CACHE_VAL cruft
especially) but this is what I have time for tonight.
Now X11 should be found on non-standard locations by means of xmkmf,
--x-includes/--x-libraries and also pkg-config.
SVN revision: 82475
Diffstat (limited to 'src/Makefile_Evas.am')
| -rw-r--r-- | src/Makefile_Evas.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 1893e1cb50..4c99c78fde 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -553,6 +553,9 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @EVAS_CFLAGS@ +if BUILD_ENGINE_GL_X11 +modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@ +endif modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ lib/eet/libeet.la \ lib/evas/libevas.la @@ -653,9 +656,9 @@ if EVAS_STATIC_BUILD_GL_X11 lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES) lib_evas_libevas_la_CPPFLAGS += \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ -@evas_engine_gl_xlib_cflags@ +@evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@ lib_evas_libevas_la_LIBADD += \ -@evas_engine_gl_xlib_libs@ +@evas_engine_gl_xlib_libs@ @evas_engine_gl_xcb_libs@ else engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la @@ -670,6 +673,7 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_xlib_cflags@ \ +@evas_engine_gl_xcb_cflags@ \ @EVAS_CFLAGS@ modules_evas_engines_gl_x11_module_la_LIBADD = if ! EVAS_STATIC_BUILD_GL_COMMON @@ -679,7 +683,8 @@ endif modules_evas_engines_gl_x11_module_la_LIBADD += \ lib/eet/libeet.la \ lib/evas/libevas.la \ -@evas_engine_gl_xlib_libs@ +@evas_engine_gl_xlib_libs@ \ +@evas_engine_gl_xcb_libs@ modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static endif |