more clean ups

SVN revision: 28976
This commit is contained in:
tilman 2007-03-23 23:04:32 +00:00 committed by tilman
parent e24eeed435
commit 10ce990a4f
1 changed files with 60 additions and 74 deletions

View File

@ -267,27 +267,25 @@ fi
AC_SUBST(ecore_x_cflags) AC_SUBST(ecore_x_cflags)
AC_SUBST(ecore_x_libs) AC_SUBST(ecore_x_libs)
AC_MSG_CHECKING(whether ecore_job module is to be built)
want_ecore_job="yes";
have_ecore_job="no"; have_ecore_job="no";
ecore_job_cflags=""; ecore_job_cflags="";
ecore_job_libs=""; ecore_job_libs="";
AC_ARG_ENABLE(ecore-job, AC_ARG_ENABLE(ecore-job,
[ --disable-ecore-job disable the ecore_job module], AC_HELP_STRING(
[ [--enable-ecore-job],
if test x"$enableval" = x"yes" ; then [enable the ecore_job module. [[default=enabled]]]
AC_MSG_RESULT(yes) ), [
else want_ecore_job=$enableval
AC_MSG_RESULT(no)
want_ecore_job="no"
fi
], [ ], [
AC_MSG_RESULT(yes) want_ecore_job=yes
] ]
) )
AC_MSG_CHECKING(whether ecore_job module is to be built)
AC_MSG_RESULT($want_ecore_job)
if test "x$want_ecore_job" = "xyes"; then if test "x$want_ecore_job" = "xyes"; then
AC_DEFINE(BUILD_ECORE_JOB, 1, [Build Ecore_Job Module]) AC_DEFINE(BUILD_ECORE_JOB, 1, [Build Ecore_Job Module])
have_ecore_job="yes"; have_ecore_job="yes";
@ -297,27 +295,24 @@ fi
AC_SUBST(ecore_job_cflags) AC_SUBST(ecore_job_cflags)
AC_SUBST(ecore_job_libs) AC_SUBST(ecore_job_libs)
want_ecore_dfb="yes";
have_ecore_dfb="no"; have_ecore_dfb="no";
ecore_dfb_cflags=""; ecore_dfb_cflags="";
ecore_dfb_libs=""; ecore_dfb_libs="";
AC_MSG_CHECKING(whether ecore_dfb module is to be built) AC_ARG_ENABLE(ecore-dfb,
AC_HELP_STRING(
AC_ARG_ENABLE(ecore-dfb, [--enable-ecore-dfb],
[ --disable-ecore-dfb disable the ecore_dfb module], [enable the ecore_dfb module. [[default=enabled]]]
[ ), [
if test "$enableval" = "yes" ; then want_ecore_dfb=$enableval
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
want_ecore_dfb="no"
fi
], [ ], [
AC_MSG_RESULT(yes) want_ecore_dfb=yes
] ]
) )
AC_MSG_CHECKING(whether ecore_dfb module is to be built)
AC_MSG_RESULT($want_ecore_dfb)
if test "x$want_ecore_dfb" = "xyes"; then if test "x$want_ecore_dfb" = "xyes"; then
PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16, PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16,
[ [
@ -333,27 +328,24 @@ fi
AC_SUBST(ecore_dfb_cflags) AC_SUBST(ecore_dfb_cflags)
AC_SUBST(ecore_dfb_libs) AC_SUBST(ecore_dfb_libs)
want_ecore_fb="no";
have_ecore_fb="no"; have_ecore_fb="no";
ecore_fb_cflags=""; ecore_fb_cflags="";
ecore_fb_libs=""; ecore_fb_libs="";
AC_MSG_CHECKING(whether ecore_fb module is to be built) AC_ARG_ENABLE(ecore-fb,
AC_HELP_STRING(
AC_ARG_ENABLE(ecore-fb, [--enable-ecore-fb],
[ --enable-ecore-fb enable the ecore_fb module], [enable the ecore_fb module. [[default=disabled]]]
[ ), [
if test x"$enableval" = x"yes" ; then want_ecore_fb=$enableval
AC_MSG_RESULT(yes)
want_ecore_fb="yes"
else
AC_MSG_RESULT(no)
fi
], [ ], [
AC_MSG_RESULT(no) want_ecore_fb=no
] ]
) )
AC_MSG_CHECKING(whether ecore_fb module is to be built)
AC_MSG_RESULT($want_ecore_fb)
tslib_libs="" tslib_libs=""
if test "x$want_ecore_fb" = "xyes"; then if test "x$want_ecore_fb" = "xyes"; then
AC_CHECK_HEADER(tslib.h, AC_CHECK_HEADER(tslib.h,
@ -380,26 +372,24 @@ AC_SUBST(ecore_fb_libs)
ecore_evas_cflags=""; ecore_evas_cflags="";
ecore_evas_libs=""; ecore_evas_libs="";
want_ecore_evas="yes"
have_ecore_evas="no" have_ecore_evas="no"
evas_cflags=""; evas_cflags="";
evas_libs=""; evas_libs="";
AC_MSG_CHECKING(whether ecore_evas module is to be built) AC_ARG_ENABLE(ecore-evas,
AC_ARG_ENABLE(ecore-evas, AC_HELP_STRING(
[ --disable-ecore-evas disable the ecore_evas module], [--enable-ecore-evas],
[ [enable the ecore_evas module. [[default=enabled]]]
if test x"$enableval" = x"yes" ; then ), [
AC_MSG_RESULT(yes) want_ecore_evas=$enableval
else
AC_MSG_RESULT(no)
want_ecore_evas="no";
fi
], [ ], [
AC_MSG_RESULT(yes) want_ecore_evas=yes
] ]
) )
AC_MSG_CHECKING(whether ecore_evas module is to be built)
AC_MSG_RESULT($want_ecore_evas)
if test "x$want_ecore_evas" = "xyes"; then if test "x$want_ecore_evas" = "xyes"; then
PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9], PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9],
[ [
@ -415,24 +405,22 @@ fi
AC_SUBST(ecore_evas_cflags) AC_SUBST(ecore_evas_cflags)
AC_SUBST(ecore_evas_libs) AC_SUBST(ecore_evas_libs)
want_ecore_evas_gl="yes";
have_ecore_evas_gl="no"; have_ecore_evas_gl="no";
AC_MSG_CHECKING(whether ecore_evas gl support is to be built) AC_ARG_ENABLE(ecore-evas-gl,
AC_ARG_ENABLE(ecore-evas-gl, AC_HELP_STRING(
[ --disable-ecore-evas-gl disable gl in the ecore_evas module], [--enable-ecore-evas-gl],
[ [disable GL support in the ecore_evas module. [[default=enabled]]]
if test x"$enableval" = x"yes" ; then ), [
AC_MSG_RESULT(yes) want_ecore_evas_gl=$enableval
else
AC_MSG_RESULT(no)
want_ecore_evas_gl="no"
fi
], [ ], [
AC_MSG_RESULT(yes) want_ecore_evas_gl=yes
] ]
) )
AC_MSG_CHECKING(whether ecore_evas gl support is to be built)
AC_MSG_RESULT($want_ecore_evas_gl)
dnl GL support requires X support, so we should dnl GL support requires X support, so we should
dnl handle the case where our user is on crack dnl handle the case where our user is on crack
dnl i.e. user disables X but enables GL dnl i.e. user disables X but enables GL
@ -455,24 +443,22 @@ else
fi fi
fi fi
want_ecore_evas_xrender="yes";
have_ecore_evas_xrender="no"; have_ecore_evas_xrender="no";
AC_MSG_CHECKING(whether ecore_evas xrender support is to be built) AC_ARG_ENABLE(ecore-evas-xrender,
AC_ARG_ENABLE(ecore-evas-xrender, AC_HELP_STRING(
[ --disable-ecore-evas-xrender disable xrender in the ecore_evas module], [--enable-ecore-evas-xrender],
[ [disable XRender support in the ecore_evas module. [[default=enabled]]]
if test x"$enableval" = x"yes" ; then ), [
AC_MSG_RESULT(yes) want_ecore_evas_xrender=$enableval
else
AC_MSG_RESULT(no)
want_ecore_evas_xrender="no"
fi
], [ ], [
AC_MSG_RESULT(yes) want_ecore_evas_xrender=yes
] ]
) )
AC_MSG_CHECKING(whether ecore_evas xrender support is to be built)
AC_MSG_RESULT($want_ecore_evas_xrender)
dnl Xrender support requires X support, so we should dnl Xrender support requires X support, so we should
dnl handle the case where our user is on crack dnl handle the case where our user is on crack
dnl i.e. user disables X but enables Xrender dnl i.e. user disables X but enables Xrender