enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Update ephoto to tilman's pkg-config changes. 

SVN revision: 28948
This commit is contained in:
titan 2007-03-23 02:06:31 +00:00 committed by titan
parent ea1e0cfdb6
commit 9b6d776f59
2 changed files with 58 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
configure.in
View File

@ -73,6 +73,7 @@ PKG_CHECK_MODULES([SQLITE], sqlite3,
], ],
[ [
have_sqlite3="No" have_sqlite3="No"
echo "Sqlite3 was not found by pkg-config!";
AC_MSG_ERROR([Ephoto needs sqlite3 to compile.]) AC_MSG_ERROR([Ephoto needs sqlite3 to compile.])
] ]
) )
@ -87,66 +88,60 @@ PKG_CHECK_MODULES([EXIF], libexif >= 0.6.13,
] ]
) )
PROG="evas-config"; PKG_CHECK_MODULES([EVAS], evas,
AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH) [
if test -z "$EVAS_CONFIG" ; then have_evas="Yes"
echo $PROG " is not in your \$PATH. Please ensure it is."; ],
echo "Read the manual page for you shell as to how to extend your path."; [
AC_MSG_ERROR(Cannot find $PROG) have_evas="No"
fi echo "Evas was not found by pkg-config!";
evas_cflags=`$EVAS_CONFIG --cflags` AC_MSG_ERROR([Ephoto needs evas to compile.])
evas_libs=`$EVAS_CONFIG --libs` ]
AC_SUBST(evas_cflags) )
AC_SUBST(evas_libs)
PROG="ecore-config"; PKG_CHECK_MODULES([ECORE], ecore,
AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH) [
if test -z "$ECORE_CONFIG" ; then have_ecore="Yes"
echo $PROG " is not in your \$PATH. Please ensure it is."; ],
echo "Read the manual page for you shell as to how to extend your path."; [
AC_MSG_ERROR(Cannot find $PROG) have_ecore="No"
fi echo "Ecore was not found by pkg-config!";
ecore_cflags=`$ECORE_CONFIG --cflags` AC_MSG_ERROR([Ephoto needs ecore to compile.])
ecore_libs=`$ECORE_CONFIG --libs` ]
AC_SUBST(ecore_cflags) )
AC_SUBST(ecore_libs)
PROG="ewl-config"; PKG_CHECK_MODULES([EDJE], edje,
AC_PATH_PROG(EWL_CONFIG, $PROG, "", $PATH) [
if test -z "$EWL_CONFIG" ; then have_edje="Yes"
echo $PROG " is not in your \$PATH. Please ensure it is."; ],
echo "Read the manual page for your shell as to how to extend your path."; [
AC_MSG_ERROR(Cannot find $PROG) have_edje="No"
fi echo "Edje was not found by pkg-config!";
ewl_cflags=`$EWL_CONFIG --cflags` AC_MSG_ERROR([Ephoto needs edje to compile.])
ewl_libs=`$EWL_CONFIG --libs` ]
AC_SUBST(ewl_cflags) )
AC_SUBST(ewl_libs)
PROG="edje-config"; PKG_CHECK_MODULES([EWL], ewl,
AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH) [
if test -z "$EDJE_CONFIG" ; then have_ewl="Yes"
echo $PROG " is not in your \$PATH. Please ensure it is."; ],
echo "Read the manual page for you shell as to how to extend your path."; [
AC_MSG_ERROR(Cannot find $PROG) have_ewl="No"
fi echo "Ewl was not found by pkg-config!";
edje_cflags=`$EDJE_CONFIG --cflags` AC_MSG_ERROR([Ephoto needs ewl to compile.])
edje_libs=`$EDJE_CONFIG --libs` ]
AC_SUBST(edje_cflags) )
AC_SUBST(edje_libs)
PKG_CHECK_MODULES([EPSILON], epsilon,
PROG="epsilon-config"; [
AC_PATH_PROG(EPSILON_CONFIG, $PROG, "", $PATH) have_epsilon="Yes"
if test -z "$EPSILON_CONFIG" ; then ],
echo $PROG " is not in your \$PATH. Please ensure it is."; [
echo "Read the manual page for you shell as to how to extend your path."; have_epsilon="No"
AC_MSG_ERROR(Cannot find $PROG) echo "Epsilon was not found by pkg-config!";
fi AC_MSG_ERROR([Ephoto needs epsilon to compile.])
epsilon_cflags=`$EPSILON_CONFIG --cflags` ]
epsilon_libs=`$EPSILON_CONFIG --libs` )
AC_SUBST(epsilon_cflags)
AC_SUBST(epsilon_libs)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
@ -185,11 +180,11 @@ echo "------------------------------------------------------------------------"
echo echo
echo "Configuration Options Summary:" echo "Configuration Options Summary:"
echo echo
echo " Evas ............: Yes" echo " Evas ............: $have_evas"
echo " Ecore ...........: Yes" echo " Ecore ...........: $have_ecore"
echo " Edje ............: Yes" echo " Edje ............: $have_edje"
echo " Epsilon .........: Yes" echo " Epsilon .........: $have_epsilon"
echo " EWL .............: Yes" echo " Ewl .............: $have_ewl"
echo " Libexif .........: $have_exif" echo " Libexif .........: $have_exif"
echo " Sqlite3 .........: $have_sqlite3" echo " Sqlite3 .........: $have_sqlite3"
echo echo

4
src/bin/Makefile.am
View File

@ -16,9 +16,9 @@ ephoto_SOURCES = ephoto.c \
ephoto_slideshow.c \ ephoto_slideshow.c \
ephoto_utils.c ephoto_utils.c
ephoto_CFLAGS = @ewl_cflags@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall -Werror ephoto_CFLAGS = @EWL_CFLAGS@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall -Werror
ephoto_LDADD = @ewl_libs@ @SQLITE_LIBS@ @EXIF_LIBS@ ephoto_LDADD = @EWL_LIBS@ @SQLITE_LIBS@ @EXIF_LIBS@
EXTRA_DIST = \ EXTRA_DIST = \
ephoto.h ephoto.h