summaryrefslogtreecommitdiff
path: root/m4/ecore_check_c_extension.m4
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-09 16:48:40 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-09 16:48:40 +0000
commit57090b2abbb9dea419c99c5ce33a48e07ec33725 (patch)
treec5f6dd8cf2883a413994f0be2c6fb5df2b2d0c3f /m4/ecore_check_c_extension.m4
parentf0a7a2a75170043bb3c44e511cc3558dc585293c (diff)
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 'm4/ecore_check_c_extension.m4')
-rw-r--r--m4/ecore_check_c_extension.m48
1 files changed, 5 insertions, 3 deletions
diff --git a/m4/ecore_check_c_extension.m4 b/m4/ecore_check_c_extension.m4
index f6e88ac579..da4b44fe0c 100644
--- a/m4/ecore_check_c_extension.m4
+++ b/m4/ecore_check_c_extension.m4
@@ -4,13 +4,15 @@ AC_DEFUN([ECORE_CHECK_X_EXTENSION],
4pushdef([UP], translit([$1], [a-z], [A-Z]))dnl 4pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
5 5
6 SAVE_CFLAGS=$CFLAGS 6 SAVE_CFLAGS=$CFLAGS
7 CFLAGS="$x_cflags ${x_includes:+-I${x_includes}}" 7 CFLAGS="$CFLAGS $ECORE_X_XLIB_cflags"
8 AC_CHECK_HEADER(X11/extensions/$2, 8 AC_CHECK_HEADER(X11/extensions/$2,
9 [ 9 [
10 SAVE_LIBS=$LIBS
11 LIBS="$LIBS $ECORE_X_XLIB_libs"
10 AC_CHECK_LIB($3, $4, 12 AC_CHECK_LIB($3, $4,
11 [AC_DEFINE(ECORE_[]UP, 1, [Build support for $1])], 13 [AC_DEFINE(ECORE_[]UP, 1, [Build support for $1])],
12 [AC_MSG_ERROR([Missing support for X extension: $1])], 14 [AC_MSG_ERROR([Missing support for X extension: $1])])
13 [$x_libs]) 15 LIBS=$SAVE_LIBS
14 ], 16 ],
15 [AC_MSG_ERROR([Missing X11/extensions/$2])], 17 [AC_MSG_ERROR([Missing X11/extensions/$2])],
16 [ #include <X11/Xlib.h> ] 18 [ #include <X11/Xlib.h> ]