enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix help of the configure. 

there is only --enable-*** options displayed, with no default value,
so if someone wants me to add them, please tell me (it's a bit of
work, though :p)


SVN revision: 45577
This commit is contained in:
Vincent Torri 2010-01-26 08:57:57 +00:00
parent 82ea9859e8
commit f6b734e78c
2 changed files with 49 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
legacy/ecore/configure.ac
View File

@ -792,10 +792,10 @@ fi
## Core modules
# ecore_txt
ECORE_CHECK_MODULE([Txt], [${want_ecore_txt}], [$have_iconv])
ECORE_CHECK_MODULE([txt], [${want_ecore_txt}], [Txt], [$have_iconv])
# ecore_con
ECORE_CHECK_MODULE([Con], [${want_ecore_con}])
ECORE_CHECK_MODULE([con], [${want_ecore_con}], [Con])
have_curl="no"
have_gnutls="no"
@ -842,11 +842,11 @@ fi
AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
# ecore_ipc
ECORE_CHECK_MODULE([Ipc], [${want_ecore_ipc}], [${have_ecore_con}],
ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}],
[requirements_ecore_ipc="ecore-con ${requirements_ecore_ipc}"])
# ecore_file
ECORE_CHECK_MODULE([File], [${want_ecore_file}])
ECORE_CHECK_MODULE([file], [${want_ecore_file}], [File])
have_poll="no"
have_inotify="no"
@ -867,12 +867,12 @@ if test "x${have_eet}" = "xyes" -a "x${have_evas}" -a "x${have_ecore_ipc}" ; th
ecore_config_deps="yes"
fi
ECORE_CHECK_MODULE([Config], [${want_ecore_config}], [${ecore_config_deps}],
ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}],
[requirements_ecore_config="ecore-ipc evas eet ${requirements_ecore_config}"])
# ecore_imf
ECORE_CHECK_MODULE([IMF], [${want_ecore_imf}])
ECORE_CHECK_MODULE([imf], [${want_ecore_imf}], [Imf])
# ecore_imf_evas
@ -881,12 +881,12 @@ if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then
ecore_imf_evas_deps="yes"
fi
ECORE_CHECK_MODULE([IMF_EVAS], [${want_ecore_imf}], [${ecore_imf_evas_deps}],
ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}],
[requirements_ecore_imf_evas="ecore-imf evas ${requirements_ecore_imf_evas}"])
# ecore_input{_evas}
ECORE_CHECK_MODULE([Input], [${want_ecore_input}])
ECORE_CHECK_MODULE([Input_Evas], [${want_ecore_input}], [${have_evas}],
ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input])
ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}],
[requirements_ecore_input_evas="ecore-input evas ${requirements_ecore_input}"])
## Graphic systems
@ -900,7 +900,7 @@ if test "x${have_x}" = "xyes" -a \
ecore_x_deps="yes"
fi
ECORE_CHECK_MODULE([X], [${want_ecore_x}], [${ecore_x_deps}],
ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}],
[
ecore_x_libs="$ecore_x_libs $x_libs"
requirements_ecore_x="ecore-input ecore-txt ${requirements_ecore_x}"
@ -908,7 +908,7 @@ ECORE_CHECK_MODULE([X], [${want_ecore_x}], [${ecore_x_deps}],
# ecore_win32
ECORE_CHECK_MODULE([Win32], [${want_ecore_win32}], [${have_ecore_input}],
ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}],
[
ecore_win32_libs="-lole32 -lgdi32"
requirements_ecore_win32="ecore-input ${requirements_ecore_win32}"
@ -922,7 +922,7 @@ if test "x${have_ecore_input}" = "xyes" -a "x${have_quartz}" = "xyes" ; then
ecore_quartz_deps="yes"
fi
ECORE_CHECK_MODULE([QUARTZ], [${want_ecore_quartz}], [${ecore_quartz_deps}],
ECORE_CHECK_MODULE([quartz], [${want_ecore_quartz}], [Quartz], [${ecore_quartz_deps}],
[requirements_ecore_quartz="ecore-input ${requirements_ecore_quartz}"])
# ecore_sdl
@ -932,11 +932,11 @@ if test "x${have_sdl}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then
ecore_sdl_deps="yes"
fi
ECORE_CHECK_MODULE([SDL], [${want_ecore_sdl}], [${ecore_sdl_deps}],
ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}],
[requirements_ecore_sdl="ecore-input ${requirements_ecore_sdl}"])
# ecore_fb
ECORE_CHECK_MODULE([FB], [${want_ecore_fb}], [$have_fb])
ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb])
if test "x${have_ecore_fb}" = "xyes" ; then
ECORE_CHECK_TSLIB([${want_tslib}],
@ -949,12 +949,12 @@ fi
# ecore_directfb
ECORE_CHECK_MODULE([DirectFB], [${want_ecore_directfb}], [${have_directfb}],
ECORE_CHECK_MODULE([directfb], [${want_ecore_directfb}], [DirectFB], [${have_directfb}],
[requirements_ecore_directfb="directfb ${requirements_ecore_directfb}"])
# ecore_wince
ECORE_CHECK_MODULE([WinCE], [${want_ecore_wince}], [${have_ecore_input}],
ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}],
[requirements_ecore_win32="ecore-input ${requirements_ecore_win32}"])
## Ecore Evas
@ -966,7 +966,7 @@ if test "x${have_evas}" = "xyes" -a "x${have_ecore_input}" = "xyes" -a "x${have_
ecore_evas_deps="yes"
fi
ECORE_CHECK_MODULE([Evas], [${want_ecore_evas}], [${ecore_evas_deps}],
ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}],
[requirements_ecore_evas="ecore-input ecore-input-evas evas ${requirements_ecore_evas}"])
# ecore_evas_buffer

76
legacy/ecore/m4/ecore_check_module.m4
View File

@ -1,35 +1,32 @@
dnl use: ECORE_CHECK_MODULE(Foo, default-enabled[, dependancy[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
dnl use: ECORE_CHECK_MODULE(Foo, default-enabled, description[, dependancy[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
AC_DEFUN([ECORE_CHECK_MODULE],
[
m4_pushdef([UP], m4_toupper([$1]))dnl
m4_pushdef([DOWN], m4_tolower([$1]))dnl
m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
have_ecore_[]m4_defn([DOWN])=no
ecore_[]m4_defn([DOWN])[]_cflags=
ecore_[]m4_defn([DOWN])[]_libs=
want_module=$2
if test "x${want_module}" = "xno" ; then
AC_ARG_ENABLE(ecore-[]m4_defn([DOWN]),
[AC_HELP_STRING(
[--enable-ecore-[]m4_defn([DOWN])],
[enable the ecore_]m4_defn([DOWN])[ module. [[default=disabled]]])],
[want_module=$enableval],
[want_module=no])
else
AC_ARG_ENABLE(ecore-[]m4_defn([DOWN]),
[AC_HELP_STRING(
[--disable-ecore-[]m4_defn([DOWN])],
[disable the ecore_]m4_defn([DOWN])[ module. [[default=enabled]]])],
[want_module=$enableval],
[want_module=yes])
fi
AC_ARG_ENABLE(ecore-$1,
[AC_HELP_STRING(
[--enable-ecore-$1],
[enable the ecore_]m4_defn([DOWN])[ module])],
[
if test "x${enableval}" = "xyes" ; then
want_module="yes"
else
want_module="no"
fi
],
[])
AC_MSG_CHECKING([whether ecore_]m4_defn([DOWN])[ module is to be built])
AC_MSG_CHECKING([whether Ecore_$3 module is to be built])
if test "x${want_module}" = "xyes" ; then
if test "x$3" = "x" -o "x$3" = "xyes" ; then
AC_DEFINE([BUILD_ECORE_]m4_defn([UP]), [1], [Build Ecore_$1 Module])
if test "x$4" = "x" || test "x$4" = "xyes" ; then
AC_DEFINE([BUILD_ECORE_]m4_defn([UP]), [1], [Build Ecore_$3 Module])
have_ecore_[]m4_defn([DOWN])="yes"
ecore_[]m4_defn([DOWN])[]_libs="-lecore_[]m4_defn([DOWN])"
AC_MSG_RESULT([yes])
@ -42,11 +39,7 @@ fi
AM_CONDITIONAL([BUILD_ECORE_]UP, [test "x$have_ecore_]DOWN[" = "xyes"])
if test "x$have_ecore_[]m4_defn([DOWN])" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
AS_IF([test "x$have_ecore_[]m4_defn([DOWN])" = "xyes"], [$5], [$6])
AC_SUBST(ecore_[]m4_defn([DOWN])[]_cflags)
AC_SUBST(ecore_[]m4_defn([DOWN])[]_libs)
@ -64,19 +57,18 @@ m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
have_ecore_evas_[]m4_defn([DOWN])="no"
want_module="$2"
if test "x${want_module}" = "xno" ; then
AC_ARG_ENABLE(ecore-evas-$1,
[AC_HELP_STRING(
[--enable-ecore-evas-$1],
[enable $3 support in the ecore_evas module.])],
[want_module=$enableval])
else
AC_ARG_ENABLE(ecore-evas-$1,
[AC_HELP_STRING(
[--disable-ecore-evas-$1],
[disable $3 support in the ecore_evas module.])],
[want_module=$enableval])
fi
AC_ARG_ENABLE(ecore-evas-$1,
[AC_HELP_STRING(
[--enable-ecore-evas-$1],
[enable $3 support in the ecore_evas module.])],
[
if test "x${enableval}" = "xyes" ; then
want_module="yes"
else
want_module="no"
fi
],
[])
AC_MSG_CHECKING([whether ecore_evas $3 support is to be built])
AC_MSG_RESULT([${want_module}])
@ -94,11 +86,7 @@ fi
AC_MSG_CHECKING([whether ecore_evas $3 support is built])
AC_MSG_RESULT([$have_ecore_evas_]m4_defn([DOWN]))
if test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes" ; then
m4_default([$5], [:])
else
m4_default([$6], [:])
fi
AS_IF([test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes"], [$5], [$6])
m4_popdef([UP])
m4_popdef([DOWN])