-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hello Ibukun
please chech these files:
configure.in: correct EFL check against *-config files
main.c: correct evas check for GL renderer
entrance_session.c: fix a segfault when DISPLAY=(null)
With kind regards,
Michel
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCKENWMSWL0LSvaHgRAiDiAJ9v0wdUOvJXsSFQgd6f7kqk3L/gMwCgr6nS
8ymbLCMQTON1VzU0aDrv1O0=
=y+GK
-----END PGP SIGNATURE-----
? configure.in.pc
? patch
Index: configure.in
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v
retrieving revision 1.39
diff -r1.39 configure.in
44,67c44,51
< AC_ARG_WITH(edb,
< [ --with-edb=DIR use edb in <DIR>],
< [ CFLAGS="$CFLAGS -I$withval/include"
< LIBS="-L$withval/lib $LIBS"])
< AC_ARG_WITH(evas,
< [ --with-evas=DIR use evas in <DIR>],
< [ CFLAGS="$CFLAGS -I$withval/include"
< LIBS="-L$withval/lib $LIBS"])
< AC_ARG_WITH(ecore,
< [ --with-ecore=DIR use ecore in <DIR>],
< [ CFLAGS="$CFLAGS -I$withval/include"
< LIBS="-L$withval/lib $LIBS"])
< AC_ARG_WITH(edje,
< [ --with-edje=DIR use edje in <DIR>],
< [ CFLAGS="$CFLAGS -I$withval/include"
< LIBS="-L$withval/lib $LIBS"])
<
< AC_PATH_GENERIC(edb, 1.0.3, [
< AC_SUBST(edb_libs)
< AC_SUBST(edb_cflags) ],
< AC_MSG_ERROR(Cannot find edb: Is edb-config in path?))
< edb_libs=`edb-config --libs`
< edb_cflags=`edb-config --cflags`
< AC_SUBST(edb_libs)
---
> # EFL configuration
> AC_ARG_WITH(edb-config,
> [ --with-edb-config=EDB_CONFIG use edb-config specified ],
> [ EDB_CONFIG=$withval; echo "using "$EDB_CONFIG" for edb-config"; ],
> [ PROG="edb-config"; AC_PATH_PROG(EDB_CONFIG, $PROG, "", $PATH) ]
> )
> edb_cflags=`$EDB_CONFIG --cflags`
> edb_libs=`$EDB_CONFIG --libs`
69,77c53,69
<
< AC_PATH_GENERIC(evas, 1.0.0, [
< AC_SUBST(evas_libs)
< AC_SUBST(evas_cflags) ],
< AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
< evas_libs=`evas-config --libs`
< evas_cflags=`evas-config --cflags`
<
< AC_SUBST(evas_libs)
---
> AC_SUBST(edb_libs)
> AC_ARG_WITH(eet-config,
> [ --with-eet-config=EET_CONFIG use eet-config specified ],
> [ EET_CONFIG=$withval; echo "using "$EET_CONFIG" for eet-config"; ],
> [ PROG="eet-config"; AC_PATH_PROG(EET_CONFIG, $PROG, "", $PATH) ]
> )
> eet_cflags=`$EET_CONFIG --cflags`
> eet_libs=`$EET_CONFIG --libs`
> AC_SUBST(eet_cflags)
> AC_SUBST(eet_libs)
> AC_ARG_WITH(evas-config,
> [ --with-evas-config=EVAS_CONFIG use evas-config specified ],
> [ EVAS_CONFIG=$withval; echo "using "$EVAS_CONFIG" for evas-config"; ],
> [ PROG="evas-config"; AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH) ]
> )
> evas_cflags=`$EVAS_CONFIG --cflags`
> evas_libs=`$EVAS_CONFIG --libs`
79,115c71,78
<
< have_ecore=no
< AC_CHECK_HEADER(Ecore.h,,
< AC_MSG_ERROR([Ecore.h not found! Have you installed Ecore?]))
< AC_CHECK_LIB(ecore, ecore_list_new,
< [have_ecore=yes],
< AC_MSG_ERROR([Ecore check failed! Make sure you have the latest version of
Ecore installed.]))
<
< have_ecore_evas=no
< AC_CHECK_HEADER(Ecore_Evas.h,,
< AC_MSG_ERROR([Ecore_Evas.h not found! Did you compile Ecore with Evas
support?]))
<
< AC_CHECK_LIB(ecore_evas, ecore_evas_init, [
< have_ecore_evas=yes],
< AC_MSG_ERROR([Cannot find Ecore_Evas!]))
<
< have_ecore_software_x11=no
< AC_CHECK_LIB(ecore_evas, ecore_evas_software_x11_new, [
< have_ecore_software_x11=yes],
< AC_MSG_ERROR([Ecore_Evas does not have Software/X11 support!]))
<
< have_ecore_gl_x11=no
< AC_CHECK_LIB(ecore_evas, ecore_evas_gl_x11_new, [
< have_ecore_gl_x11=yes
< AC_DEFINE(HAVE_ECORE_GL_X11, 1, [OpenGL support])])
<
< have_ecore_ipc=no
< AC_CHECK_HEADER(Ecore_Ipc.h,,
< AC_MSG_ERROR([Ecore_Ipc.h not found! Did you compile Ecore with IPC
support?]))
<
< AC_CHECK_LIB(ecore_ipc, ecore_ipc_init, [
< have_ecore_ipc=yes],
< AC_MSG_ERROR([Cannot find Ecore_Ipc!]))
<
< ecore_cflags=`ecore-config --cflags`
< ecore_libs=`ecore-config --libs`
< AC_SUBST(ecore_libs)
---
> AC_SUBST(evas_libs)
> AC_ARG_WITH(ecore-config,
> [ --with-ecore-config=ECORE_CONFIG use ecore-config specified ],
> [ ECORE_CONFIG=$withval; echo "using "$ECORE_CONFIG" for ecore-config"; ],
> [ PROG="ecore-config"; AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH) ]
> )
> ecore_cflags=`$ECORE_CONFIG --cflags`
> ecore_libs=`$ECORE_CONFIG --libs`
117,124c80,87
<
< AC_PATH_GENERIC(edje, 0.5.0, [
< AC_SUBST(edje_libs)
< AC_SUBST(edje_cflags) ],
< AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
< edje_libs=`edje-config --libs`
< edje_cflags=`edje-config --cflags`
< AC_SUBST(edje_libs)
---
> AC_SUBST(ecore_libs)
> AC_ARG_WITH(edje-config,
> [ --with-edje-config=EDJE_CONFIG use edje-config specified ],
> [ EDJE_CONFIG=$withval; echo "using "$EDJE_CONFIG" for edje-config"; ],
> [ PROG="edje-config"; AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH) ]
> )
> edje_cflags=`$EDJE_CONFIG --cflags`
> edje_libs=`$EDJE_CONFIG --libs`
126,133c89,96
<
< AC_PATH_GENERIC(esmart, 0.9.0, [
< AC_SUBST(esmart_libs)
< AC_SUBST(esmart_cflags) ],
< AC_MSG_ERROR(Cannot find esmart: Is esmart-config in path?))
< esmart_libs=`esmart-config --libs`
< esmart_cflags=`esmart-config --cflags`
< AC_SUBST(esmart_libs)
---
> AC_SUBST(edje_libs)
> AC_ARG_WITH(esmart-config,
> [ --with-esmart-config=ESMART_CONFIG use esmart-config
> specified ],
> [ ESMART_CONFIG=$withval; echo "using "$ESMART_CONFIG" for esmart-config";
> ],
> [ PROG="esmart-config"; AC_PATH_PROG(ESMART_CONFIG, $PROG, "", $PATH) ]
> )
> esmart_cflags=`$ESMART_CONFIG --cflags`
> esmart_libs=`$ESMART_CONFIG --libs`
134a98
> AC_SUBST(esmart_libs)
221a186,191
> # Hack to show if OpenGL is included in evas
> have_ecore_gl_x11=unknown
> evas_gl_support="`evas-config --libs | grep GL`"
> if test ! -z "$evas_gl_support" ; then
> have_ecore_gl_x11=yes
> fi
Index: src/client/entrance_session.c
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.67
diff -r1.67 entrance_session.c
38c38
< char *db;
---
> char *db, *str;
49,51c49,51
< if (!display)
< e->display = strdup(getenv("DISPLAY"));
< else
---
> if (!display) {
> if ((str = getenv("DISPLAY"))) e->display = strdup(str);
> } else
Index: src/client/main.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/main.c,v
retrieving revision 1.69
diff -r1.69 main.c
770,780c770,790
< if (!session->config->engine)
< e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
< #ifdef HAVE_ECORE_GL_X11
< else if (session->config->engine)
< e = ecore_evas_gl_x11_new(NULL, 0, 0, 0, g_x, g_y);
< #endif
< else
< {
< fprintf(stderr,
< "Warning: Invalid Evas engine specified in config.
Defaulting to software engine.\n");
< e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
---
> switch (session->config->engine) {
> case 1:
> if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_GL_X11)) {
> e = ecore_evas_gl_x11_new(NULL, 0, 0, 0, g_x, g_y);
> break;
> }
> fprintf(stderr, "Warning: Evas GL engine: engine not supported.
> Defaulting to software engine.\n");
>
> case 0:
> e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
> break;
>
> default:
> fprintf(stderr, "Warning: Invalid Evas engine specified in config.
> Defaulting to software engine.\n");
> e = ecore_evas_software_x11_new(NULL, 0, 0, 0, g_x, g_y);
> break;
> }
>
> if (!e) {
> fprintf(stderr, "Critical error: No Evas engine available.
> Exiting.\n");
> return (-1);
