forked from enlightenment/efl
imlib2 is optional for edje_cc now. simplified autofoo
SVN revision: 11927
This commit is contained in:
parent
f83c81433d
commit
4873a7d260
|
@ -151,81 +151,42 @@ AC_SUBST(EDJE_CC_PRG)
|
|||
AC_SUBST(EDJE_DECC_PRG)
|
||||
|
||||
AC_ARG_WITH(eet,
|
||||
[ --with-eet=DIR use eet in <DIR>],
|
||||
[ --with-eet=DIR use eet in <DIR>],
|
||||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
|
||||
have_eet="no";
|
||||
AC_CHECK_HEADER(Eet.h,
|
||||
[ have_eet="yes" ],
|
||||
[ have_eet="no" ]
|
||||
)
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
|
||||
if test "x$have_eet" = "xyes"; then
|
||||
if [ test -z "$EET_CONFIG" ]; then EET_CONFIG="eet-config"; fi
|
||||
eet_cflags=`$EET_CONFIG --cflags`
|
||||
eet_libs=`$EET_CONFIG --libs`
|
||||
else
|
||||
AC_MSG_ERROR(Cannot find Eet.h)
|
||||
exit -1
|
||||
fi
|
||||
AC_PATH_GENERIC(eet, , ,
|
||||
AC_MSG_ERROR(Cannot find eet: Is eet-config in path?))
|
||||
|
||||
AC_SUBST(eet_cflags)
|
||||
AC_SUBST(eet_libs)
|
||||
AC_ARG_WITH(embryo,
|
||||
[ --with-embryo=DIR use embryo in <DIR>],
|
||||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
|
||||
have_embryo="no";
|
||||
AC_CHECK_HEADER(Embryo.h,
|
||||
[ have_embryo="yes" ],
|
||||
[ have_embryo="no" ]
|
||||
)
|
||||
AC_PATH_GENERIC(embryo, 0.9.1, ,
|
||||
AC_MSG_ERROR(Cannot find embryo: Is embryo-config in path?))
|
||||
|
||||
if test "x$have_embryo" = "xyes"; then
|
||||
if [ test -z "$EMBRYO_CONFIG" ]; then EMBRYO_CONFIG="embryo-config"; fi
|
||||
embryo_cflags=`$EMBRYO_CONFIG --cflags`
|
||||
embryo_libs=`$EMBRYO_CONFIG --libs`
|
||||
else
|
||||
AC_MSG_ERROR(Cannot find Embryo.h)
|
||||
exit -1
|
||||
fi
|
||||
|
||||
AC_SUBST(embryo_cflags)
|
||||
AC_SUBST(embryo_libs)
|
||||
|
||||
imlib2_cflags=""
|
||||
imlib2_libs=""
|
||||
if test "x$have_edje_cc" = "xyes"; then
|
||||
AC_ARG_WITH(imlib2,
|
||||
[ --with-imlib2=DIR use imlib2 in <DIR>],
|
||||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
|
||||
AC_PATH_GENERIC(imlib2, , [
|
||||
AC_SUBST(imlib2_libs)
|
||||
AC_SUBST(imlib2_cflags)],
|
||||
AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in path?))
|
||||
imlib2_libs=`imlib2-config --libs`
|
||||
imlib2_cflags=`imlib2-config --cflags`
|
||||
AC_PATH_GENERIC(imlib2, ,
|
||||
AC_DEFINE(HAVE_IMLIB, 1, [Define to 1 if you have Imlib2]), [
|
||||
have_imlib2="no"
|
||||
AC_MSG_WARN(Cannot find imlib2: Is imlib2-config in path?)
|
||||
])
|
||||
fi
|
||||
AC_SUBST(imlib2_cflags)
|
||||
AC_SUBST(imlib2_libs)
|
||||
|
||||
AC_ARG_WITH(evas,
|
||||
[ --with-evas=DIR use evas in <DIR>],
|
||||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
|
||||
AC_PATH_GENERIC(evas, , [
|
||||
AC_SUBST(evas_libs)
|
||||
AC_SUBST(evas_cflags)],
|
||||
AC_PATH_GENERIC(evas, , ,
|
||||
AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
|
||||
|
||||
if [ test -z "$EVAS_CONFIG" ]; then EVAS_CONFIG="evas-config"; fi
|
||||
evas_cflags=`$EVAS_CONFIG --cflags`
|
||||
evas_libs=`$EVAS_CONFIG --libs`
|
||||
|
||||
AC_SUBST(evas_cflags)
|
||||
AC_SUBST(evas_libs)
|
||||
|
||||
AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [
|
||||
#include <Evas.h>
|
||||
])
|
||||
|
@ -243,18 +204,9 @@ AC_ARG_WITH(ecore,
|
|||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
|
||||
AC_PATH_GENERIC(ecore, , [
|
||||
AC_SUBST(ecore_libs)
|
||||
AC_SUBST(ecore_cflags)],
|
||||
AC_PATH_GENERIC(ecore, , ,
|
||||
AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
|
||||
|
||||
if [ test -z "$ECORE_CONFIG" ]; then ECORE_CONFIG="ecore-config"; fi
|
||||
ecore_cflags=`$ECORE_CONFIG --cflags`
|
||||
ecore_libs=`$ECORE_CONFIG --libs`
|
||||
|
||||
AC_SUBST(ecore_cflags)
|
||||
AC_SUBST(ecore_libs)
|
||||
|
||||
AC_MSG_CHECKING([for location of Vim data files])
|
||||
install_vim="yes";
|
||||
AC_ARG_WITH(vim,
|
||||
|
@ -311,3 +263,11 @@ edje-config
|
|||
chmod +x edje-config
|
||||
touch edje_docs.tar.gz
|
||||
])
|
||||
|
||||
if test "x$have_edje_cc" = "xyes"; then
|
||||
if test "x$have_imlib2" = "xno"; then
|
||||
echo
|
||||
echo "WARNING: Building edje_cc without Imlib2 support!"
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -4,10 +4,10 @@ INCLUDES = \
|
|||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/bin \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
@eet_cflags@ \
|
||||
@evas_cflags@ \
|
||||
@ecore_cflags@ \
|
||||
@imlib2_cflags@
|
||||
@EET_CFLAGS@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@ECORE_CFLAGS@ \
|
||||
@IMLIB2_CFLAGS@
|
||||
|
||||
bin_SCRIPTS = \
|
||||
edje_recc
|
||||
|
@ -48,7 +48,7 @@ edje_cc_sources.c
|
|||
|
||||
edje_cc_LDADD = \
|
||||
$(top_builddir)/src/lib/libedje.la \
|
||||
@imlib2_libs@
|
||||
@IMLIB2_LIBS@
|
||||
|
||||
edje_cc_CPPFLAGS = @edje_def@
|
||||
|
||||
|
@ -65,7 +65,7 @@ edje_cc_sources.c
|
|||
|
||||
edje_decc_LDADD = \
|
||||
$(top_builddir)/src/lib/libedje.la \
|
||||
@imlib2_libs@
|
||||
@IMLIB2_LIBS@
|
||||
|
||||
edje_decc_CPPFLAGS = @edje_def@
|
||||
|
||||
|
|
|
@ -236,6 +236,7 @@ data_write(void)
|
|||
free(fdata);
|
||||
}
|
||||
}
|
||||
#ifdef HAVE_IMLIB
|
||||
if ((edje_file) && (edje_file->image_dir))
|
||||
{
|
||||
for (l = edje_file->image_dir->entries; l; l = l->next)
|
||||
|
@ -404,6 +405,7 @@ data_write(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
for (l = edje_collections; l; l = l->next)
|
||||
{
|
||||
Edje_Part_Collection *pc;
|
||||
|
|
|
@ -10,10 +10,10 @@ INCLUDES = \
|
|||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
-I$(includedir) \
|
||||
@eet_cflags@ \
|
||||
@embryo_cflags@ \
|
||||
@evas_cflags@ \
|
||||
@ecore_cflags@ \
|
||||
@EET_CFLAGS@ \
|
||||
@EMBRYO_CFLAGS@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@ECORE_CFLAGS@ \
|
||||
@edje_def@
|
||||
|
||||
lib_LTLIBRARIES = \
|
||||
|
@ -42,7 +42,7 @@ edje_container.h \
|
|||
edje_message_queue.c \
|
||||
edje_private.h
|
||||
|
||||
libedje_la_LIBADD = $(LDFLAGS) -lm @evas_libs@ @ecore_libs@ @eet_libs@ @embryo_libs@ @fnmatch_libs@
|
||||
libedje_la_LIBADD = $(LDFLAGS) -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@
|
||||
libedje_la_CPPFLAGS =
|
||||
libedje_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||
libedje_la_LDFLAGS = -version-info 5:0:5
|
||||
|
@ -50,6 +50,6 @@ libedje_la_LDFLAGS = -version-info 5:0:5
|
|||
libedje_edit_la_SOURCES = \
|
||||
edje_edit.c
|
||||
|
||||
libedje_edit_la_LIBADD = $(LDFLAGS) -lm @evas_libs@ @ecore_libs@ @eet_libs@ @embryo_libs@ $(top_builddir)/src/lib/libedje.la
|
||||
libedje_edit_la_LIBADD = $(LDFLAGS) -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ $(top_builddir)/src/lib/libedje.la
|
||||
libedje_edit_la_DEPENDENCIES = $(top_builddir)/config.h libedje.la
|
||||
libedje_edit_la_LDFLAGS = -version-info 5:0:5
|
||||
|
|
Loading…
Reference in New Issue