From: <enl...@li...> - 2002-06-18 01:54:50
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas2 Dir : e17/libs/evas2 Modified Files: Tag: SPLIT acconfig.h configure.in Log Message: fix portrait mode bug... oops.. off by one... and cleanups.. clean up bin code filenames... now whyt he hell isnt theotpional buildign working properly with src/bin? see the comment in Makefile.am =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/Attic/acconfig.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -3 -r1.1.2.1 -r1.1.2.2 --- acconfig.h 22 May 2002 08:09:22 -0000 1.1.2.1 +++ acconfig.h 18 Jun 2002 01:54:20 -0000 1.1.2.2 @@ -9,3 +9,6 @@ #undef PACKAGE_SOURCE_DIR #undef PACKAGE_BIN_DIR #undef PACKAGE_LIB_DIR +#undef BUILD_ENGINE_SOFTWARE_X11 +#undef BUILD_ENGINE_DIRECTFB +#undef BUILD_ENGINE_FB =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas2/Attic/configure.in,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -3 -r1.1.2.8 -r1.1.2.9 --- configure.in 17 Jun 2002 06:56:55 -0000 1.1.2.8 +++ configure.in 18 Jun 2002 01:54:20 -0000 1.1.2.9 @@ -98,21 +98,32 @@ AC_SUBST(freetype_cflags) AC_SUBST(freetype_libs) -# hard coded X... -x_dir="/usr/X11R6"; -x_cflags="-I"$x_dir"/include -DUSE_X_API=1" -x_libs="-L"$x_dir"/lib -lX11 -lXext" -AC_SUBST(x_cflags) -AC_SUBST(x_libs) +x_dir="" +x_cflags="" +x_libs="" + +AC_MSG_CHECKING(whether software x11 backend is to be built) -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, test "yes" = "yes") +AC_ARG_ENABLE(software-x11, [ --enable-software-x11 enable the Software X11 rendering backend], [ + if test "$enableval" = "yes"; then + AC_MSG_RESULT(yes) + AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, test "$enableval" = "yes") + AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11) + x_dir="/usr/X11R6"; + x_cflags="-I"$x_dir"/include" + x_libs="-L"$x_dir"/lib -lX11 -lXext" + else + AC_MSG_RESULT(no) + fi], AC_MSG_RESULT(no) +) AC_MSG_CHECKING(whether directfb backend is to be built) -AC_ARG_ENABLE(directfb, [ --enable-direcfb enable the DirectFB rendering backend], [ +AC_ARG_ENABLE(directfb, [ --enable-direcfb enable the DirectFB rendering backend], [ if test "$enableval" = "yes"; then AC_MSG_RESULT(yes) AM_CONDITIONAL(BUILD_ENGINE_DIRECTFB, test "$enableval" = "yes") + AC_DEFINE(BUILD_ENGINE_DIRECTFB) PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.12) else AC_MSG_RESULT(no) @@ -121,14 +132,18 @@ AC_MSG_CHECKING(whether fb backend is to be built) -AC_ARG_ENABLE(fb, [ --enable-fb enable the FB rendering backend], [ +AC_ARG_ENABLE(fb, [ --enable-fb enable the FB rendering backend], [ if test "$enableval" = "yes"; then AC_MSG_RESULT(yes) AM_CONDITIONAL(BUILD_ENGINE_FB, test "$enableval" = "yes") + AC_DEFINE(BUILD_ENGINE_FB) else AC_MSG_RESULT(no) fi], AC_MSG_RESULT(no) ) + +AC_SUBST(x_cflags) +AC_SUBST(x_libs) AC_OUTPUT([ Makefile |