forked from enlightenment/efl
parent
661ae6ff13
commit
7a097c0ab9
|
@ -96,10 +96,6 @@ else
|
|||
AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for libraries])
|
||||
fi
|
||||
|
||||
dnl Set PACKAGE_SOURCE_DIR in config.h.
|
||||
packagesrcdir=`cd $srcdir && pwd`
|
||||
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
|
||||
|
||||
AC_MSG_CHECKING(whether to build edje_cc)
|
||||
have_edje_cc="yes"
|
||||
AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ], [
|
||||
|
@ -115,59 +111,44 @@ AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ],
|
|||
]
|
||||
)
|
||||
|
||||
AC_ARG_WITH(eet,
|
||||
[ --with-eet=DIR use eet in <DIR>],
|
||||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
AC_ARG_WITH(evas-config, [ --with-evas-config=EVAS_CONFIG use evas-config specified ],
|
||||
[ EVAS_CONFIG=$withval;
|
||||
echo "using "$EVAS_CONFIG" for evas-config"; ],
|
||||
[ AC_PATH_PROG(EVAS_CONFIG, "evas-config", "", $PATH) ])
|
||||
evas_cflags=`$EVAS_CONFIG --cflags`
|
||||
evas_libs=`$EVAS_CONFIG --libs`
|
||||
|
||||
AC_PATH_GENERIC(eet, , ,
|
||||
AC_MSG_ERROR(Cannot find eet: Is eet-config in path?))
|
||||
AC_ARG_WITH(ecore-config, [ --with-ecore-config=ECORE_CONFIG use ecore-config specified ],
|
||||
[ ECORE_CONFIG=$withval;
|
||||
echo "using "$ECORE_CONFIG" for ecore-config"; ],
|
||||
[ AC_PATH_PROG(ECORE_CONFIG, "ecore-config", "", $PATH) ])
|
||||
ecore_cflags=`$ECORE_CONFIG --cflags`
|
||||
ecore_libs=`$ECORE_CONFIG --libs`
|
||||
|
||||
AC_ARG_WITH(embryo,
|
||||
[ --with-embryo=DIR use embryo in <DIR>],
|
||||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
AC_ARG_WITH(eet-config, [ --with-eet-config=EET_CONFIG use eet-config specified ],
|
||||
[ EET_CONFIG=$withval;
|
||||
echo "using "$EET_CONFIG" for eet-config"; ],
|
||||
[ AC_PATH_PROG(EET_CONFIG, "eet-config", "", $PATH) ])
|
||||
eet_cflags=`$EET_CONFIG --cflags`
|
||||
eet_libs=`$EET_CONFIG --libs`
|
||||
|
||||
AC_PATH_GENERIC(embryo, 0.9.1, ,
|
||||
AC_MSG_ERROR(Cannot find embryo: Is embryo-config in path?))
|
||||
AC_ARG_WITH(embryo-config, [ --with-embryo-config=EMBRYO_CONFIG use embryo-config specified ],
|
||||
[ EMBRYO_CONFIG=$withval;
|
||||
echo "using "$EMBRYO_CONFIG" for embryo-config"; ],
|
||||
[ AC_PATH_PROG(EMBRYO_CONFIG, "embryo-config", "", $PATH) ])
|
||||
embryo_cflags=`$EMBRYO_CONFIG --cflags`
|
||||
embryo_libs=`$EMBRYO_CONFIG --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"
|
||||
IMLIB2_CONFIG="$withval/bin/imlib2-config"])
|
||||
if [ test -z "$IMLIB2_CONFIG" ]; then IMLIB2_CONFIG="imlib2-config"; fi
|
||||
imlib2_libs=`$IMLIB2_CONFIG --libs`
|
||||
AC_ARG_WITH(imlib2-config, [ --with-imlib2-config=IMLIB2_CONFIG use imlib2-config specified ],
|
||||
[ IMLIB2_CONFIG=$withval;
|
||||
echo "using "$IMLIB2_CONFIG" for imlib2-config"; ],
|
||||
[ AC_PATH_PROG(IMLIB2_CONFIG, "imlib2-config", "", $PATH) ])
|
||||
imlib2_cflags=`$IMLIB2_CONFIG --cflags`
|
||||
V=`$IMLIB2_CONFIG --version`
|
||||
if [ test -z "$V" ]; then
|
||||
have_edje_cc="no";
|
||||
AC_MSG_WARN(Cannot find imlib2: Is imlib2-config in path?)
|
||||
else
|
||||
AC_DEFINE(HAVE_IMLIB, 1, [Define to 1 if you have Imlib2])
|
||||
fi
|
||||
imlib2_libs=`$IMLIB2_CONFIG --libs`
|
||||
AC_DEFINE(HAVE_IMLIB, 1, [Define to 1 if you have Imlib2])
|
||||
fi
|
||||
|
||||
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_MSG_ERROR(Cannot find evas: Is evas-config in path?))
|
||||
|
||||
AC_ARG_WITH(ecore,
|
||||
[ --with-ecore=DIR use ecore in <DIR>],
|
||||
[CFLAGS="$CFLAGS -I$withval/include"
|
||||
LIBS="-L$withval/lib $LIBS"])
|
||||
|
||||
AC_PATH_GENERIC(ecore, , ,
|
||||
AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
|
||||
|
||||
AC_CHECK_HEADERS(Ecore_X.h)
|
||||
AC_CHECK_HEADERS(Ecore_Fb.h)
|
||||
|
||||
AC_MSG_CHECKING([for location of Vim data files])
|
||||
install_vim="yes";
|
||||
AC_ARG_WITH(vim,
|
||||
|
@ -196,6 +177,9 @@ else
|
|||
AC_MSG_RESULT([Not found, EDC syntax file will not be installed])
|
||||
fi
|
||||
|
||||
EMBRYO_PREFIX=`$EMBRYO_CONFIG --prefix`
|
||||
AC_DEFINE_UNQUOTED(EMBRYO_PREFIX, "${EMBRYO_PREFIX}", [Embryo prefix])
|
||||
|
||||
EDJE_CC_PRG=""
|
||||
EDJE_DECC_PRG=""
|
||||
if test "x$have_edje_cc" = "xyes"; then
|
||||
|
@ -204,8 +188,6 @@ if test "x$have_edje_cc" = "xyes"; then
|
|||
EDJE_CC_PRG="edje_cc"
|
||||
EDJE_DECC_PRG="edje_decc"
|
||||
EDJE_RECC_PRG="edje_recc"
|
||||
IMLIB2_CFLAGS=$imlib2_cflags
|
||||
IMLIB2_LIBS=$imlib2_libs
|
||||
else
|
||||
AM_CONDITIONAL(BUILD_EDJE_CC, false)
|
||||
AM_CONDITIONAL(BUILD_EDJE_DECC, false)
|
||||
|
@ -213,8 +195,17 @@ fi
|
|||
AC_SUBST(EDJE_CC_PRG)
|
||||
AC_SUBST(EDJE_DECC_PRG)
|
||||
AC_SUBST(EDJE_RECC_PRG)
|
||||
AC_SUBST(IMLIB2_CFLAGS)
|
||||
AC_SUBST(IMLIB2_LIBS)
|
||||
|
||||
AC_SUBST(evas_cflags)
|
||||
AC_SUBST(evas_libs)
|
||||
AC_SUBST(ecore_cflags)
|
||||
AC_SUBST(ecore_libs)
|
||||
AC_SUBST(eet_cflags)
|
||||
AC_SUBST(eet_libs)
|
||||
AC_SUBST(embryo_cflags)
|
||||
AC_SUBST(embryo_libs)
|
||||
AC_SUBST(imlib2_cflags)
|
||||
AC_SUBST(imlib2_libs)
|
||||
|
||||
AC_SUBST(vimdir)
|
||||
|
||||
|
|
|
@ -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_PRG@
|
||||
|
@ -43,7 +43,7 @@ edje_cc_sources.c
|
|||
|
||||
edje_cc_LDADD = \
|
||||
$(top_builddir)/src/lib/libedje.la \
|
||||
@IMLIB2_LIBS@
|
||||
@imlib2_libs@
|
||||
|
||||
edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||
|
||||
|
@ -56,7 +56,7 @@ edje_cc_sources.c
|
|||
|
||||
edje_decc_LDADD = \
|
||||
$(top_builddir)/src/lib/libedje.la \
|
||||
@IMLIB2_LIBS@
|
||||
@imlib2_libs@
|
||||
|
||||
edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||
|
||||
|
|
|
@ -668,7 +668,8 @@ data_write(void)
|
|||
fd = mkstemp(tmpo);
|
||||
if (fd >= 0)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "embryo_cc -i %s -o %s %s",
|
||||
snprintf(buf, sizeof(buf),
|
||||
EMBRYO_PREFIX"/bin/embryo_cc -i %s -o %s %s",
|
||||
DAT"data/include", tmpo, tmpn);
|
||||
ret = system(buf);
|
||||
if (ret != 0)
|
||||
|
|
|
@ -577,11 +577,11 @@ compile(void)
|
|||
strcat(def, " ");
|
||||
}
|
||||
}
|
||||
snprintf(buf, sizeof(buf), "cat %s | cpp %s -E -o %s", file_in, def, tmpn);
|
||||
snprintf(buf, sizeof(buf), "cat %s | /usr/bin/cpp %s -E -o %s", file_in, def, tmpn);
|
||||
ret = system(buf);
|
||||
if (ret < 0)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "gcc %s -E -o %s %s", def, tmpn, file_in);
|
||||
snprintf(buf, sizeof(buf), "/usr/bin/gcc %s -E -o %s %s", def, tmpn, file_in);
|
||||
ret = system(buf);
|
||||
}
|
||||
if (ret >= 0) file_in = tmpn;
|
||||
|
|
|
@ -9,10 +9,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@
|
||||
|
||||
lib_LTLIBRARIES = \
|
||||
libedje.la
|
||||
|
@ -38,7 +38,7 @@ edje_container.h \
|
|||
edje_message_queue.c \
|
||||
edje_private.h
|
||||
|
||||
libedje_la_LIBADD = -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@
|
||||
libedje_la_LIBADD = -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
|
||||
|
|
Loading…
Reference in New Issue