I'm sending this again after waiting 12+ hours for the last mail to end
up on the list. Sorry if it ends up being delivered twice.
On Thu, 3 Jan 2013 20:25:47 +0900
Carsten Haitzler (The Rasterman) <[email protected]> wrote:
> On Sat, 24 Nov 2012 23:48:09 +0100 Joel Klinghed <[email protected]>
> said:
>
> > Hi,
> >
> > I installed alpha5 on my main machine today and encountered a
> > couple of problems, mainly configure issues (patches included) but
> > one crash (or because e_alert & software composition doesn't seem
> > to work for me, hang).
> >
> > As a pretext to my configuration issues, I'm running on my very own
> > LFS with homebrew prefix based package handling. So every program is
> > installed in its own prefix and not dumped in the mess that is /usr.
> > Also my X11 is not installed in /usr, /usr/X11 or any other of the
> > numerous "default" locations. So yes, I'm rather used to having to
> > nudge certain configure scripts into doing what they advertise ;)
> > (almost all configure scripts I've seen check the prefix for X11,
> > very few actually use it, EFL do pretty well considering).
> >
> > On to the patches (based on the 1.7.2 packages released recently):
> >
> > * eina-1.7.2-dirfd-fix.patch
> > The check for dirfd used AC_LANG_PROGRAM incorrectly and thus always
> > failed.
>
> already fixed - but differently.
In the efl tree, yes.
eina-1.7 branch still has the problem but perhaps it's not serious
enough? Also noticed that the eet-1.7 branch has the same problem.
I've included updated patches for the 1.7 branches anyway.
>
> > * eet-1.7.2-libgcrypt.patch
> > Use cflags returned from libgcrypt-config when compiling files
> > including libgcrypt.h
>
> fixed it seems in later 1.7.x and in efl svn.
Not fixed on eet-1.7 branch.
> > * evas-1.7.2-configure-xorg.patch
> > Use X_CFLAGS when checking X11 and GL headers and X_LIBS when
> > checking X11 and GL libs.
> > Also use X_CFLAGS when compiling gl_common as GL headers might use
> > the same prefix.
>
> ummm configure.ac is a lot different now... try again?
I've included an patch for the merged efl tree.
Also an updated patch for the evas-1.7 and ecore-1.7 branches.
> > * evas-1.7.2-fribidi.patch
> > pkg-config --cflags for fribidi has always returned
> > ${prefix}/include/fribidi so including fribidi/fribidi.h doesn't
> > work.
>
> indeed - right. i dont know how this has been missed for so long.
configure.ac check merged, but I don't see the fix for the source files?
Included patch for both the merged efl tree and the evas-1.7 branch for
those.
> > * enlightenment-0.17.0-alpha5-e_xsettings.patch
> > e_xsettings.c use X11 headers directly, so must check for x_cflags.
>
> better solution. make the code not use x headers directly.
>
> > * enlightenment-0.17.0-alpha5-mixer-alsa.patch
> > Use cflags from pkg-config alsa-lib when using alsa headers.
>
> indeed u are right! this should be there. added.
>
> > * enlightenment-0.17.0-alpha5-xkb_base.patch
> > When searching for xkeyboard-config rules, before trying a long
> > list of guessed standard paths, check the one given by the
> > pkg-config file if it exists.
>
> this is better indeed.
Missed that the wizard has it's own code for looking up the rules,
included a patch for that based on the enlightenment-0.17.0 branch.
> > With all these patches applied I can compile, install and run
> > enlightenment fine (well, have to fiddle a bit with EDJE_PREFIX and
> > EDJE_LIB_DIR to allow edje and embryo to be installed in different
> > prefixes on a multilib system).
> >
> > I do however get a crash when trying to change the style of a shelf
> > on one of my secondary screens to invisible.
> > Attached gdb stacktrace (gdb.txt) and valgrind output
> > (valgrind.txt). Running with valgrind the operation actually
> > succeeds but gives a few bad accesses.
> > Please tell me if you need any more information.
> >
> > Regards, Joel Klinghed
>
> i'm going to have to pass on debugging these as so much has passed
> since then. do u still get segvs on latest 1.7.4 (or 1.7.5 when its
> out) and e17 release?
>
Tested on current 1.7 branches with e17 from the 0.17.0 branch, works
now with no troubles. Great.
/JKIndex: m4/common/efl_check_funcs.m4
===================================================================
--- m4/common/efl_check_funcs.m4 (revision 82096)
+++ m4/common/efl_check_funcs.m4 (working copy)
@@ -26,11 +26,8 @@
#endif
]],
[[
-int main(void)
-{
- DIR *dirp;
- return dirfd(dirp);
-}
+DIR *dirp;
+return dirfd(dirp);
]])
],
[_efl_have_fct="yes"],
Index: m4/efl_check_funcs.m4
===================================================================
--- m4/efl_check_funcs.m4 (revision 82095)
+++ m4/efl_check_funcs.m4 (working copy)
@@ -26,11 +26,8 @@
#endif
]],
[[
-int main(void)
-{
- DIR *dirp;
- return dirfd(dirp);
-}
+DIR *dirp;
+return dirfd(dirp);
]])
],
[_efl_have_fct="yes"],
Index: configure.ac
===================================================================
--- configure.ac (revision 82095)
+++ configure.ac (working copy)
@@ -68,6 +68,7 @@
### Default options with respect to host
requirements_pc_eet=""
+requirements_cflags_eet=""
requirements_libs_eet=""
### Additional options to configure
@@ -269,6 +270,7 @@
if test "x${have_gnutls}" = "xyes" ; then
AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"])
if test "x${have_gnutls}" = "xyes" ; then
+ requirements_cflags_eet="${LIBGCRYPT_CFLAGS} ${requirements_cflags_eet}"
requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}"
fi
fi
@@ -405,6 +407,7 @@
;;
esac
+EET_CFLAGS="${EET_CFLAGS} ${requirements_cflags_eet}"
EET_LIBS="${EET_LIBS} ${requirements_libs_eet}"
Index: m4/evas_check_engine.m4
===================================================================
--- m4/evas_check_engine.m4 (revision 82095)
+++ m4/evas_check_engine.m4 (working copy)
@@ -31,14 +31,23 @@
AC_PATH_X
AC_PATH_XTRA
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${X_CFLAGS} ${CFLAGS}"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
+CPPFLAGS="${CPPFLAGS_save}"
+CFLAGS="${CFLAGS_save}"
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
-fi
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS}"
+ AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
+ fi
+ LIBS="${LIBS_save}"
fi
if test "x${have_dep}" = "xyes" ; then
@@ -75,6 +84,10 @@
AC_PATH_X
AC_PATH_XTRA
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${X_CFLAGS} ${CFLAGS}"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([GL/gl.h],
[have_dep="yes"],
[have_dep="no"],
@@ -88,6 +101,8 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xresource.h>
])
+CPPFLAGS="${CPPFLAGS_save}"
+CFLAGS=${CFLAGS_save}
gl_pt_lib="";
have_gl_pt="no"
@@ -115,15 +130,20 @@
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"])
-fi
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS}"
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
-fi
+ AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
+ fi
+
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib ${X_EXTRA_LIBS}])
+ fi
+
+ LIBS="${LIBS_save}"
fi
if test "x$gl_flavor_gles" = "xyes" ; then
@@ -152,6 +172,10 @@
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
+ CFLAGS_save="${CFLAGS}"
+ CFLAGS="${X_CFLAGS} ${CFLAGS}"
+ CPPFLAGS_save="${CPPFLAGS}"
+ CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([GLES2/gl2.h],
[have_egl="yes"],
[have_egl="no"],
@@ -165,6 +189,8 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xresource.h>
])
+ CPPFLAGS=${CPPFLAGS_save}
+ CFLAGS=${CFLAGS_save}
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
@@ -242,6 +268,10 @@
AC_PATH_X
AC_PATH_XTRA
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${X_CFLAGS} ${CFLAGS}"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([GL/gl.h],
[have_dep="yes"],
[have_dep="no"],
@@ -250,6 +280,8 @@
#include <GL/glext.h>
#include <GL/glx.h>
])
+CPPFLAGS="${CPPFLAGS_save}"
+CFLAGS="${CFLAGS_save}"
gl_pt_lib="";
have_gl_pt="no"
@@ -277,15 +309,20 @@
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"])
-fi
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS}"
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
-fi
+ AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
+ fi
+
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
+ fi
+
+ LIBS="${LIBS_save}"
fi
PKG_CHECK_MODULES([XCB_GL],
@@ -326,6 +363,10 @@
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
+ CFLAGS_save="${CFLAGS}"
+ CFLAGS="${X_CFLAGS} ${CFLAGS}"
+ CPPFLAGS_save="${CPPFLAGS}"
+ CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([GLES2/gl2.h],
[have_egl="yes"],
[have_egl="no"],
@@ -334,6 +375,8 @@
#include <GLES2/gl2ext.h>
#include <EGL/egl.h>
])
+ CPPFLAGS=${CPPFLAGS_save}
+ CFLAGS=${CFLAGS_save}
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
@@ -731,14 +774,24 @@
AC_PATH_X
AC_PATH_XTRA
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${X_CFLAGS} ${CFLAGS}"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
+CPPFLAGS="${CPPFLAGS_save}"
+CFLAGS="${CFLAGS_save}"
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
-fi
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS}"
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
+ AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
+
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
+ fi
+ LIBS="${LIBS_save}"
fi
if test "x${have_dep}" = "xyes" ; then
Index: src/modules/engines/gl_common/Makefile.am
===================================================================
--- src/modules/engines/gl_common/Makefile.am (revision 82095)
+++ src/modules/engines/gl_common/Makefile.am (working copy)
@@ -8,6 +8,7 @@
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@GL_EET_CFLAGS@ \
+@X_CFLAGS@ \
@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@
Index: m4/evas_check_engine.m4
===================================================================
--- m4/evas_check_engine.m4 (revision 82096)
+++ m4/evas_check_engine.m4 (working copy)
@@ -11,14 +11,23 @@
AC_PATH_X
AC_PATH_XTRA
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${X_CFLAGS} ${CFLAGS}"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([X11/X.h], [have_dep="yes"])
+CPPFLAGS="${CPPFLAGS_save}"
+CFLAGS="${CFLAGS_save}"
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"])
-fi
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS}"
+ AC_CHECK_LIB([X11], [XCreateImage], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"])
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([Xext], [XShmCreateImage], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
+ fi
+ LIBS="${LIBS_save}"
fi
if test "x${have_dep}" = "xyes" ; then
@@ -55,6 +64,10 @@
AC_PATH_X
AC_PATH_XTRA
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${X_CFLAGS} ${CFLAGS}"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([GL/gl.h],
[have_dep="yes"],
[have_dep="no"],
@@ -68,6 +81,8 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xresource.h>
])
+CPPFLAGS="${CPPFLAGS_save}"
+CFLAGS=${CFLAGS_save}
gl_pt_lib="";
have_gl_pt="no"
@@ -95,15 +110,20 @@
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"])
-fi
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS}"
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
-fi
+ AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib])
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
+ fi
+
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib ${X_EXTRA_LIBS}])
+ fi
+
+ LIBS="${LIBS_save}"
fi
if test "x${gl_flavor_gles}" = "xyes" ; then
@@ -129,6 +149,10 @@
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
+ CFLAGS_save="${CFLAGS}"
+ CFLAGS="${x_cflags} ${CFLAGS}"
+ CPPFLAGS_save="${CPPFLAGS}"
+ CPPFLAGS="${x_cflags} ${CPPFLAGS}"
AC_CHECK_HEADER([GLES2/gl2.h],
[have_egl="yes"],
[have_egl="no"],
@@ -142,6 +166,8 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xresource.h>
])
+ CPPFLAGS="${CPPFLAGS_save}"
+ CFLAGS="${CFLAGS_save}"
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
@@ -250,15 +276,20 @@
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"])
-fi
+ LIBS_save="${LIBS}"
+ LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS}"
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"])
-fi
+ AC_CHECK_LIB([X11], [XCreateColormap], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([Xrender], [XRenderCreatePicture], [have_dep="yes"], [have_dep="no"], [${X_EXTRA_LIBS}])
+ fi
+
+ if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib ${X_EXTRA_LIBS}])
+ fi
+
+ LIBS="${LIBS_save}"
fi
PKG_CHECK_EXISTS([x11-xcb xcb xcb-glx xcb-render xcb-renderutil],
@@ -305,6 +336,10 @@
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender"
fi
+ CFLAGS_save="${CFLAGS}"
+ CFLAGS="${X_CFLAGS} ${CFLAGS}"
+ CPPFLAGS_save="${CPPFLAGS}"
+ CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([GLES2/gl2.h],
[have_egl="yes"],
[have_egl="no"],
@@ -313,6 +348,8 @@
#include <GLES2/gl2ext.h>
#include <EGL/egl.h>
])
+ CPPFLAGS=${CPPFLAGS_save}
+ CFLAGS=${CFLAGS_save}
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
@@ -519,6 +556,10 @@
gl_pt_lib=" -pthread"
fi
+CFLAGS_save="${CFLAGS}"
+CFLAGS="${X_CFLAGS} ${CFLAGS}"
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${X_CFLAGS} ${CPPFLAGS}"
AC_CHECK_HEADER([GL/gl.h],
[have_dep="yes"],
[have_dep="no"],
@@ -526,6 +567,8 @@
#include <GL/gl.h>
#include <GL/glext.h>
])
+CPPFLAGS="${CPPFLAGS_save}"
+CFLAGS="${CFLAGS_save}"
if test "x$gl_flavor_gles" = "xyes" ; then
have_dep=no
@@ -542,6 +585,8 @@
#include <SDL/SDL_opengles.h>
#include <EGL/egl.h>
])
+ CPPFLAGS=${CPPFLAGS_save}
+ CFLAGS=${CFLAGS_save}
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
Index: src/Makefile_Ecore_X.am
===================================================================
--- src/Makefile_Ecore_X.am (revision 82096)
+++ src/Makefile_Ecore_X.am (working copy)
@@ -140,6 +140,7 @@
noinst_PROGRAMS += utils/ecore/makekeys
utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
+utils_ecore_makekeys_CFLAGS = @ECORE_X_CFLAGS@
EXTRA_DIST += utils/ecore/mkks.sh
Index: src/Makefile_Ecore_Evas.am
===================================================================
--- src/Makefile_Ecore_Evas.am (revision 82096)
+++ src/Makefile_Ecore_Evas.am (working copy)
@@ -73,7 +73,8 @@
-I$(top_srcdir)/src/lib/ecore_x \
-I$(top_builddir)/src/lib/ecore_x \
-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
--I$(top_srcdir)/src/modules/evas/engines/gl_x11
+-I$(top_srcdir)/src/modules/evas/engines/gl_x11 \
+@ECORE_X_CFLAGS@
modules_ecore_evas_engines_x_module_la_LIBADD = \
lib/ecore_evas/libecore_evas.la \
lib/ecore_x/libecore_x.la
Index: src/Makefile_Ecore_Imf.am
===================================================================
--- src/Makefile_Ecore_Imf.am (revision 82096)
+++ src/Makefile_Ecore_Imf.am (working copy)
@@ -151,7 +151,8 @@
-I$(top_builddir)/src/lib/ecore_x \
-I$(top_srcdir)/src/lib/ecore_imf \
@ECORE_IMF_CFLAGS@ \
-@EFL_COV_CFLAGS@
+@EFL_COV_CFLAGS@ \
+@ECORE_X_CFLAGS@
modules_ecore_immodules_xim_xim_la_LIBADD = \
lib/ecore_imf/libecore_imf.la \
lib/ecore_x/libecore_x.la \
Index: src/Makefile_Evas.am
===================================================================
--- src/Makefile_Evas.am (revision 82096)
+++ src/Makefile_Evas.am (working copy)
@@ -550,6 +550,9 @@
-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@
+endif
modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
lib/eet/libeet.la \
lib/evas/libevas.la
Index: configure.ac
===================================================================
--- configure.ac (revision 82096)
+++ configure.ac (working copy)
@@ -2600,7 +2600,7 @@
use_Xcursor="no"
if test "x${want_x11_xlib}" = "xyes" ; then
CFLAGS_save="${CFLAGS}"
- CFLAGS="$x_cflags $x_includes"
+ CFLAGS="$x_cflags"
AC_CHECK_HEADER([X11/Xcursor/Xcursor.h],
[use_Xcursor="yes"],
[use_Xcursor="no"],
@@ -2649,7 +2649,7 @@
[use_Xcursor="no"],
[$x_libs -lXrender])
EFL_ADD_LIBS([ECORE_X], [${Xcursor_libs}])
- EFL_ADD_CFLAGS([ECORE_X], [$x_cflags $x_includes])
+ EFL_ADD_CFLAGS([ECORE_X], [$x_cflags])
fi
if test "x${want_x11_xlib}" = "xyes" ; then
Index: src/lib/engines/common/language/evas_bidi_utils.c
===================================================================
--- src/lib/engines/common/language/evas_bidi_utils.c (revision 82095)
+++ src/lib/engines/common/language/evas_bidi_utils.c (working copy)
@@ -11,7 +11,7 @@
#include "evas_font_private.h"
#ifdef BIDI_SUPPORT
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
/**
* @internal
* @addtogroup Evas_Utils
Index: src/lib/engines/common/language/evas_bidi_utils.h
===================================================================
--- src/lib/engines/common/language/evas_bidi_utils.h (revision 82095)
+++ src/lib/engines/common/language/evas_bidi_utils.h (working copy)
@@ -28,7 +28,7 @@
#include <Eina.h>
#ifdef USE_FRIBIDI
-# include <fribidi/fribidi.h>
+# include <fribidi.h>
#endif
/* abstract fribidi - we statically define sizes here because otherwise we would
Index: src/lib/evas/common/language/evas_bidi_utils.c
===================================================================
--- src/lib/evas/common/language/evas_bidi_utils.c (revision 82096)
+++ src/lib/evas/common/language/evas_bidi_utils.c (working copy)
@@ -11,7 +11,7 @@
#include "evas_font_private.h"
#ifdef BIDI_SUPPORT
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
/**
* @internal
* @addtogroup Evas_Utils
Index: src/lib/evas/common/language/evas_bidi_utils.h
===================================================================
--- src/lib/evas/common/language/evas_bidi_utils.h (revision 82096)
+++ src/lib/evas/common/language/evas_bidi_utils.h (working copy)
@@ -28,7 +28,7 @@
#include <Eina.h>
#ifdef USE_FRIBIDI
-# include <fribidi/fribidi.h>
+# include <fribidi.h>
#endif
/* abstract fribidi - we statically define sizes here because otherwise we would
Index: src/modules/wizard/page_011.c
===================================================================
--- src/modules/wizard/page_011.c (revision 82097)
+++ src/modules/wizard/page_011.c (working copy)
@@ -18,6 +18,10 @@
{
int i = 0;
const char *lstfiles[] = {
+#ifdef XKB_BASE
+ XKB_BASE "/rules/xorg.lst",
+ XKB_BASE "/rules/xfree86.lst",
+#endif
#if defined __NetBSD__
"/usr/X11R7/lib/X11/xkb/rules/xorg.lst",
#elif defined __OpenBSD__
------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
