Edje: do not fail if eio is not available (edje_watch is compiled only if eio is available)
SVN revision: 70912
This commit is contained in:
parent
f9de301af5
commit
806d74d25f
|
@ -65,7 +65,7 @@ AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw32ce* | cegcc*)
|
mingw32ce*)
|
||||||
MODULE_ARCH="$host_os-$host_cpu"
|
MODULE_ARCH="$host_os-$host_cpu"
|
||||||
install_vim="no"
|
install_vim="no"
|
||||||
have_edje_cc="no"
|
have_edje_cc="no"
|
||||||
|
@ -293,11 +293,8 @@ PKG_CHECK_MODULES([ECORE_IMF],
|
||||||
],
|
],
|
||||||
[have_ecore_imf="no"])
|
[have_ecore_imf="no"])
|
||||||
|
|
||||||
have_eio="no"
|
|
||||||
PKG_CHECK_MODULES([EIO],
|
PKG_CHECK_MODULES([EIO],
|
||||||
[
|
[eio >= 1.0.0],
|
||||||
eio >= 1.0.0
|
|
||||||
],
|
|
||||||
[
|
[
|
||||||
AC_DEFINE([HAVE_EIO], [1], [Eio is available for monitoring file assynchronously])
|
AC_DEFINE([HAVE_EIO], [1], [Eio is available for monitoring file assynchronously])
|
||||||
have_eio="yes"
|
have_eio="yes"
|
||||||
|
@ -334,7 +331,7 @@ if test "x${want_multisense}" = "xyes" -a "x$want_sndfile" != "xno"; then
|
||||||
],
|
],
|
||||||
[have_sndfile="no"; want_multisense="no"]
|
[have_sndfile="no"; want_multisense="no"]
|
||||||
)
|
)
|
||||||
|
|
||||||
if test "x$want_sndfile" = "xyes" -a "x$have_sndfile" = "xno"; then
|
if test "x$want_sndfile" = "xyes" -a "x$have_sndfile" = "xno"; then
|
||||||
AC_MSG_ERROR([sndfile support requested, but not found by pkg-config.])
|
AC_MSG_ERROR([sndfile support requested, but not found by pkg-config.])
|
||||||
fi
|
fi
|
||||||
|
@ -419,7 +416,7 @@ if test "x${want_multisense}" = "xyes" -a "x$want_alsa_lib" != "xno"; then
|
||||||
if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then
|
if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then
|
||||||
AC_MSG_ERROR([alsa support requested, but not found by pkg-config.])
|
AC_MSG_ERROR([alsa support requested, but not found by pkg-config.])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([HAVE_LIBALSA], [test "x${have_alsa_lib}" = "xyes"])
|
AM_CONDITIONAL([HAVE_LIBALSA], [test "x${have_alsa_lib}" = "xyes"])
|
||||||
|
|
||||||
|
|
||||||
|
@ -457,33 +454,43 @@ fi
|
||||||
|
|
||||||
# Dependencies for the binaries
|
# Dependencies for the binaries
|
||||||
|
|
||||||
if test "x$have_edje_cc" = "xyes"; then
|
if test "x${have_edje_cc}" = "xyes" ; then
|
||||||
PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0])
|
PKG_CHECK_MODULES([EDJE_CC],
|
||||||
|
[ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0])
|
||||||
EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
|
EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
|
AM_CONDITIONAL([BUILD_EPP], [test "x${have_edje_cc}" = "xyes"])
|
||||||
|
|
||||||
if test "x$have_edje_decc" = "xyes"; then
|
if test "x${have_edje_decc}" = "xyes" ; then
|
||||||
PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0])
|
PKG_CHECK_MODULES([EDJE_DECC],
|
||||||
|
[ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$have_edje_player" = "xyes"; then
|
if test "x${have_edje_player}" = "xyes" ; then
|
||||||
PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
|
PKG_CHECK_MODULES([EDJE_PLAYER],
|
||||||
|
[ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$have_edje_inspector" = "xyes"; then
|
if test "x${have_edje_inspector}" = "xyes" ; then
|
||||||
PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
|
PKG_CHECK_MODULES([EDJE_INSPECTOR],
|
||||||
|
[ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$have_edje_external_inspector" = "xyes"; then
|
if test "x${have_edje_external_inspector}" = "xyes" ; then
|
||||||
PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
|
PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR],
|
||||||
|
[ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$have_edje_watch" = "xyes"; then
|
if test "x${have_edje_watch}" = "xyes" ; then
|
||||||
PKG_CHECK_MODULES([EDJE_WATCH], [ecore >= 1.2.0 eina >= 1.2.0 eio >= 1.0.0])
|
PKG_CHECK_MODULES([EDJE_WATCH],
|
||||||
|
[ecore >= 1.2.0 eina >= 1.2.0 eio >= 1.0.0],
|
||||||
|
[have_edje_watch="yes"],
|
||||||
|
[have_edje_watch="no"])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL([BUILD_EDJE_WATCH], [test "x${have_edje_watch}" = "xyes"])
|
||||||
|
|
||||||
### Checks for header files
|
### Checks for header files
|
||||||
AC_CHECK_HEADERS([locale.h sys/resource.h])
|
AC_CHECK_HEADERS([locale.h sys/resource.h])
|
||||||
|
|
||||||
|
@ -507,9 +514,6 @@ case "$host_os" in
|
||||||
mingw32ce*)
|
mingw32ce*)
|
||||||
EDJE_CFLAGS="${EDJE_CFLAGS} -D_WIN32_WCE=0x0420"
|
EDJE_CFLAGS="${EDJE_CFLAGS} -D_WIN32_WCE=0x0420"
|
||||||
;;
|
;;
|
||||||
cegcc*)
|
|
||||||
EDJE_CFLAGS="${EDJE_CFLAGS} -mwin32 -D_WIN32_WCE=0x0420"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
@ -517,7 +521,7 @@ esac
|
||||||
|
|
||||||
lt_enable_auto_import=""
|
lt_enable_auto_import=""
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw* | cegcc*)
|
mingw*)
|
||||||
lt_enable_auto_import="-Wl,--enable-auto-import"
|
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -531,7 +535,7 @@ AC_ISC_POSIX
|
||||||
AC_FUNC_ALLOCA
|
AC_FUNC_ALLOCA
|
||||||
|
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
mingw* | cegcc*)
|
mingw*)
|
||||||
AC_DEFINE([HAVE_REALPATH], [1], [Define to 1 if you have the `realpath' function.])
|
AC_DEFINE([HAVE_REALPATH], [1], [Define to 1 if you have the `realpath' function.])
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
|
@ -6,9 +6,17 @@ endif
|
||||||
|
|
||||||
bin_SCRIPTS = @EDJE_RECC_PRG@
|
bin_SCRIPTS = @EDJE_RECC_PRG@
|
||||||
|
|
||||||
bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@ @EDJE_WATCH_PRG@
|
bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@
|
||||||
|
|
||||||
EXTRA_PROGRAMS = edje_cc edje_decc edje_player edje_inspector edje_external_inspector edje_watch
|
if BUILD_EDJE_WATCH
|
||||||
|
bin_PROGRAMS += @EDJE_WATCH_PRG@
|
||||||
|
endif
|
||||||
|
|
||||||
|
EXTRA_PROGRAMS = edje_cc edje_decc edje_player edje_inspector edje_external_inspector
|
||||||
|
|
||||||
|
if BUILD_EDJE_WATCH
|
||||||
|
EXTRA_PROGRAMS += edje_watch
|
||||||
|
endif
|
||||||
|
|
||||||
edje_cc_SOURCES = \
|
edje_cc_SOURCES = \
|
||||||
edje_cc.c \
|
edje_cc.c \
|
||||||
|
|
Loading…
Reference in New Issue