Enlightenment CVS committal Author : vapier Project : e17 Module : libs/ewl
Dir : e17/libs/ewl Modified Files: configure.in Log Message: add more control/flexibilty to ecore/evas detection =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/configure.in,v retrieving revision 1.59 retrieving revision 1.60 diff -u -3 -r1.59 -r1.60 --- configure.in 18 Oct 2005 16:06:32 -0000 1.59 +++ configure.in 20 Oct 2005 05:38:08 -0000 1.60 @@ -75,17 +75,57 @@ PCFLAGS=$CFLAGS CFLAGS=$EVAS_CFLAGS" "$CFLAGS -AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [ - #include <Evas.h> - ]) - -AC_CHECK_HEADERS(Evas_Engine_GL_X11.h, [], [], [ - #include <Evas.h> - ]) - -AC_CHECK_HEADERS(Evas_Engine_FB.h, [], [], [ - #include <Evas.h> - ]) + +AC_ARG_ENABLE(software-x11, + [AC_HELP_STRING([--enable-software-x11],[enable software X11 support])], + [enable_software_x11=$enableval], [enable_software_x11="auto"]) +if test "x$enable_software_x11" != "xno" ; then + have_software_x11=no + AC_CHECK_HEADER(Evas_Engine_Software_X11.h, + [AC_CHECK_HEADER(Ecore_X.h, + [have_software_x11=yes], + [], [#include <Ecore.h>])], + [], [#include <Evas.h>]) + if test "x$have_software_x11" = "xyes" ; then + AC_DEFINE(ENABLE_EWL_SOFTWARE_X11, 1, [Enable X11 Software]) + elif test "x$enable_software_x11" = "xyes" ; then + AC_MSG_ERROR(software X11 requested but no evas/ecore support found) + fi +fi + +AC_ARG_ENABLE(opengl-x11, + [AC_HELP_STRING([--enable-opengl-x11],[enable opengl X11 support])], + [enable_opengl_x11=$enableval], [enable_opengl_x11="auto"]) +if test "x$enable_opengl_x11" != "xno" ; then + have_opengl_x11=no + AC_CHECK_HEADERS(Evas_Engine_GL_X11.h, + [AC_CHECK_HEADER(Ecore_X.h, + [have_opengl_x11=yes], + [], [#include <Ecore.h>])], + [], [#include <Evas.h>]) + if test "x$have_opengl_x11" = "xyes" ; then + AC_DEFINE(ENABLE_EWL_GL_X11, 1, [Enable OpenGL X11]) + elif test "x$enable_opengl_x11" = "xyes" ; then + AC_MSG_ERROR(opengl X11 requested but no evas/ecore support found) + fi +fi + +AC_ARG_ENABLE(fbcon, + [AC_HELP_STRING([--enable-fbcon],[enable fbcon support])], + [enable_fbcon=$enableval], [enable_fbcon="auto"]) +if test "x$enable_fbcon" != "xno" ; then + have_fbcon=no + AC_CHECK_HEADERS(Evas_Engine_FB.h, + [AC_CHECK_HEADER(Ecore_Fb.h, + [have_fbcon=yes], + [], [#include <Ecore.h>])], + [], [#include <Evas.h>]) + if test "x$have_fbcon" = "xyes" ; then + AC_DEFINE(ENABLE_EWL_FB, 1, [Enable FB]) + elif test "x$enable_fbcon" = "xyes" ; then + AC_MSG_ERROR(fbcon requested but no evas/ecore support found) + fi +fi AC_PATH_GENERIC(ecore, 0.9.9, [ ], ------------------------------------------------------- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs