kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* elementary/configure.in, 

* elementary/data/themes/Makefile.am,
	* elementary/data/objects/Makefile.am: Make configurable edje_cc binary (usefull when cross compiling).

	* elementary/src/lib/Elementary.h.in: Make libintl.h optional.



SVN revision: 38948
This commit is contained in:
Cedric BAIL 2009-02-05 10:23:04 +00:00
parent a8043c0af7
commit f53b4bea0f
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/elementary/configure.in
View File

@ -164,6 +164,21 @@ ELM_ALLOCA_H_DEF="#undef"
AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"])
AC_SUBST(ELM_ALLOCA_H_DEF)
ELM_LIBINTL_H_DEF="#undef"
AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
AC_SUBST(ELM_LIBINTL_H_DEF)
AC_ARG_WITH(edje-cc,
[ --with-edje-cc=PATH specify a specific path to edje_cc],
[
v=$withval;
edje_cc=$v
echo " Enlightenment edje_cc explicitly set to "$edje_cc;
],[
edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
])
AC_SUBST(edje_cc)
my_libs="-lm"
AC_SUBST(my_libs)
AC_SUBST(requirement_elm)
@ -203,6 +218,8 @@ echo
echo "Features:"
echo " EDBus.........: ${have_elementary_edbus}"
echo
echo "edje_cc.........: ${edje_cc}"
echo
echo "------------------------------------------------------------------------"
echo
echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE,"

2
legacy/elementary/data/objects/Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = edje_cc
EDJE_CC = @edje_cc@
EDJE_FLAGS = -v -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
filesdir = $(datadir)/elementary/objects

2
legacy/elementary/data/themes/Makefile.am
View File

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = edje_cc
EDJE_CC = @edje_cc@
EDJE_FLAGS = -v -id $(top_srcdir)/data/themes -fd $(top_srcdir)/data/themes
filesdir = $(datadir)/elementary/themes

5
legacy/elementary/src/lib/Elementary.h.in
View File

@ -21,7 +21,8 @@
@ELM_WINCE_DEF@ ELM_WINCE
@ELM_EDBUS_DEF@ ELM_EDBUS
@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
@ELM_LIBINTL_H_DEF@ ELM_LIBINTL_H
/* Standard headers for standard system calls etc. */
#include <stdio.h>
#include <stdlib.h>
@ -43,7 +44,9 @@
#ifdef ELM_UNIX
# include <locale.h>
#ifdef ELM_LIBINTL_H
# include <libintl.h>
#endif
# include <signal.h>
# include <grp.h>
# include <glob.h>