Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/entropy
Modified Files:
autogen.sh configure.in
Log Message:
cleanup of configure.in. Fix missing ecore dep
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 20 Oct 2005 08:45:54 -0000 1.1
+++ autogen.sh 22 Oct 2005 08:33:33 -0000 1.2
@@ -65,7 +65,7 @@
-echo -c "
+echo "
*******************************************************************************
*******************************************************************************
@@ -101,7 +101,7 @@
libtoolize --force --copy
fi
echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
+ aclocal -I m4 $aclocalinclude
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader
@@ -118,8 +118,7 @@
if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ...
- $srcdir/configure $conf_flags "$@" \
- && echo Now please type \`make\' to compile $PKG_NAME.
+ $srcdir/configure $conf_flags "$@"
else
echo Skipping configure process.
fi
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure.in 22 Oct 2005 05:54:26 -0000 1.2
+++ configure.in 22 Oct 2005 08:33:33 -0000 1.3
@@ -118,95 +118,202 @@
btrace=no
+AC_ARG_ENABLE(
+ btrace,
+ AC_HELP_STRING(
+ [--enable-btrace],
+ [build with extra debugging using libbtrace]
+ ),
+ [ac_btrace="$enableval"],
+ [ac_btrace="no"]
+)
AC_MSG_CHECKING(whether to link in libbtrace)
-AC_ARG_ENABLE(btrace, AC_HELP_STRING([--enable-btrace],[build with extra
debugging using libbtrace]),
- [ ac_btrace="$enableval" ],
- [ ac_btrace="no" ]
- )
if test X"$ac_btrace" = Xyes; then
- AC_CHECK_HEADER(btrace.h,
- [AC_CHECK_LIB(btrace, btrace_print,
- [btrace_libs="-lbtrace"
- btrace=yes
- AC_DEFINE(HAVE_BTRACE, 1, add support for
libbtrace)])])
+ AC_CHECK_HEADER(
+ btrace.h,
+ [AC_CHECK_LIB(
+ btrace, btrace_print,
+ [btrace_libs="-lbtrace"
+ btrace=yes
+ AC_DEFINE(HAVE_BTRACE, 1, add support for libbtrace)]
+ )]
+ )
fi
AC_SUBST(btrace_cflags)
AC_SUBST(btrace_libs)
-AC_CHECK_HEADER(wordexp.h,AC_DEFINE(HAVE_WORDEXP, 1, [whether wordexp is
present; otherwise glob will be used]))
-
+AC_CHECK_HEADER(
+ wordexp.h,
+ AC_DEFINE(HAVE_WORDEXP, 1, [whether wordexp is present; otherwise glob will
be used])
+)
+
+
+#check for ecore
+AC_PATH_EFL(
+ ecore,
+ 0.9.9,
+ [have_ecore="yes"],
+ [have_ecore="no"]
+)
+
+if test x"$have_ecore" = x"yes" ; then
+ ecore_cflags=`ecore-config --cflags`
+ ecore_libs=`ecore-config --libs`
+ AC_DEFINE(HAVE_ECORE, 1, have ECORE)
+ ecore="ECORE "
+else
+ AC_MSG_ERROR([No ECORE, can't build.])
+fi
+AC_SUBST(ecore_cflags)
+AC_SUBST(ecore_libs)
#check for ewl
-AC_PATH_GENERIC(ewl,,[ewl_libs=`ewl-config --libs`
- ewl_cflags=`ewl-config --cflags`
- AC_DEFINE(HAVE_EWL, 1, have EWL)
- ewl="EWL "; ],[
- AC_MSG_WARN([No EWL, can't build.])
- ]) AC_SUBST(ewl_libs)
+AC_PATH_EFL(
+ ewl,
+ 0.0.4,
+ [have_ewl="yes"],
+ [have_ewl="no"]
+)
+
+if test x"$have_ewl" = x"yes" ; then
+ ewl_cflags=`ewl-config --cflags`
+ ewl_libs=`ewl-config --libs`
+ AC_DEFINE(HAVE_EWL, 1, have EWL)
+ ewl="EWL "
+else
+ AC_MSG_ERROR([No EWL, can't build.])
+fi
AC_SUBST(ewl_cflags)
+AC_SUBST(ewl_libs)
#check for etk
-AM_CONDITIONAL(HAVE_ETK, false)
-AC_PATH_GENERIC(etk,,[etk_libs=`etk-config --libs`
- etk_cflags=`etk-config --cflags`
- AC_DEFINE(HAVE_ETK, 1, have ETK)
- etk="ETK ";
- AM_CONDITIONAL(HAVE_ETK, true) ],[
- AC_MSG_WARN([No ETK, can't build.])
- ]) AC_SUBST(etk_libs)
+AC_PATH_EFL(
+ etk,
+ 0.1.0,
+ [have_etk="yes"],
+ [have_etk="no"]
+)
+
+if test x"$have_etk" = x"yes" ; then
+ etk_cflags=`etk-config --cflags`
+ etk_libs=`etk-config --libs`
+ AC_DEFINE(HAVE_ETK, 1, have ETK)
+ etk="ETK "
+ AM_CONDITIONAL(HAVE_ETK, true)
+else
+ AC_MSG_WARN([No ETK, can't build ETK plugin.])
+fi
AC_SUBST(etk_cflags)
+AC_SUBST(etk_libs)
#Check for evfs
-AC_PATH_GENERIC(evfs,,[evfs_libs=`evfs-config --libs`
- evfs_cflags=`evfs-config --cflags`
- AC_DEFINE(HAVE_EVFS, 1, have EVFS)
- evfs="EVFS "; ],[
- AC_MSG_ERROR([No EVFS, can't build.])
- ]) AC_SUBST(evfs_libs)
-AC_SUBST(evfs_cflags)
+AC_PATH_EFL(
+ evfs,
+ 0.0.1,
+ [have_evfs="yes"],
+ [have_evfs="no"]
+)
+
+if test x"$have_evfs" = x"yes" ; then
+ evfs_cflags=`evfs-config --cflags`
+ evfs_libs=`evfs-config --libs`
+ AC_DEFINE(HAVE_EVFS, 1, have EVFS)
+ evfs="EVFS "
+else
+ AC_MSG_ERROR([No EVFS, can't build.])
+fi
+AC_SUBST(evfs_cflags)
+AC_SUBST(evfs_libs)
# check for Imlib2
-AC_PATH_GENERIC(imlib2,,[imlib2_libs=`imlib2-config --libs`
- imlib2_cflags=`imlib2-config --cflags`
- AC_DEFINE(HAVE_IMLIB2, 1, have Imlib2)
- imlib2="Imlib2 "; ],[
- AC_MSG_WARN([Without Imlib2 the number of image
formats we can create thumbnails for will be greatly reduced. Getting Imlib2 is
recommended.])
- ])
-AC_SUBST(imlib2_libs)
+AC_PATH_EFL(
+ imlib2,
+ 1.2.1,
+ [have_imlib2="yes"],
+ [have_imlib2="no"]
+)
+
+if test x"$have_imlib2" = x"yes" ; then
+ imlib2_cflags=`imlib2-config --cflags`
+ imlib2_libs=`imlib2-config --libs`
+ AC_DEFINE(HAVE_IMLIB2, 1, have Imlib2)
+ imlib2="Imlib2 "
+else
+ AC_MSG_WARN([Without Imlib2 the number of image formats we can create
thumbnails for will be greatly reduced. Getting Imlib2 is recommended.])
+fi
AC_SUBST(imlib2_cflags)
+AC_SUBST(imlib2_libs)
# check for libpng
-AC_ARG_WITH(libpng,
- AC_HELP_STRING([--with-libpng=DIR],[use libPNG in <DIR>]),
- [libpng="PNG "
- libpng_cflags="-I$withval/include"
- libpng_libs="-L$withval/lib"
- AC_DEFINE(HAVE_LIBPNG,1,[have libpng for
thumbnailing])],
-
[AC_PATH_GENERIC(libpng,,[libpng_libs=`libpng-config --libs`
-
libpng_cflags=`libpng-config --cflags`
- libpng="PNG "
- AC_DEFINE(HAVE_LIBPNG,
1,[have libpng for thumbnailing])],
-
[PKG_CHECK_MODULES(PNG,libpng12,
- [libpng="PNG "
-
libpng_cflags=`pkg-config --cflags libpng12`
- libpng_libs=`pkg-config
--libs libpng12`
- libpng="PNG "
- AC_DEFINE(HAVE_LIBPNG,
1,[have libpng for thumbnailing])],
-
[AC_MSG_WARN([blubbadupbleepblopbleet])])])])
+libpng_dir=""
+have_libpng="no"
+AC_ARG_WITH(
+ libpng,
+ AC_HELP_STRING(
+ [--with-libpng=DIR],
+ [use libpng in <DIR>]
+ ),
+ [libpng_dir=$withval],
+ [have_libpng="no"]
+)
+
+if ! test x"$libpng_dir" = x"" ; then
+ saved_CPPFLAGS="${CPPFLAGS}"
+ saved_LDFLAGS="${LDFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I$libpng_dir/include/libpng12"
+ AC_CHECK_HEADER(
+ [png.h],
+ [LDFLAGS="${LDFLAGS} -L$libpng_dir/lib/ -lz -lm"
+ AC_CHECK_LIB(
+ [png],
+ [main],
+ [libpng_libs="-L$libpng_dir/lib/ -lz -lm"
+ AC_DEFINE(HAVE_LIBPNG,1,[have libpng for thumbnailing])
+ libpng="PNG "
+ have_libpng="yes"],
+ [AC_MSG_WARN(libpng library not in $libpng_dir/lib)]
+ )
+ libpng_cflags="-I$libpng_dir/include/libpng12"],
+ [AC_MSG_WARN(libpng headers not in $libpng_dir/include/libpng12)]
+ )
+ CPPFLAGS="${saved_CPPFLAGS}"
+ LDFLAGS="${saved_LDFLAGS}"
+fi
+
+if test x"$have_libpng" = x"no" ; then
+ AC_PATH_GENERIC(
+ libpng,
+ 1.2.8,
+ [have_libpng="yes"
+ libpng_cflags=`libpng-config --cflags`
+ libpng_libs=`libpng-config --libs`
+ AC_DEFINE(HAVE_LIBPNG,1,[have libpng for thumbnailing])
+ libpng="PNG "
+ have_libpng="yes"],
+ [AC_MSG_WARN(libpng-config not in your PATH)]
+ )
+fi
-if test "$libpng_libs" != ""; then
- libpng_libs="$libpng_libs -lz -lm"
+if test x"$have_libpng" = x"no" ; then
+ PKG_CHECK_MODULES(
+ PNG,
+ libpng12 >= 1.2.8,
+ [have_libpng="yes"
+ libpng_cflags=`pkg-config --cflags`
+ libpng_libs=`pkg-config --libs`
+ AC_DEFINE(HAVE_LIBPNG,1,[have libpng for thumbnailing])
+ libpng="PNG "
+ have_libpng="yes"],
+ [AC_MSG_WARN([No luck, guy. No pretty thumbnailing for you !])]
+ )
fi
AC_SUBST(libpng_cflags)
AC_SUBST(libpng_libs)
-if test "$libpng" = ""; then
- AC_MSG_WARN([Building without PNG image library libpng -- disabling
thumbnail image previews!!])
-fi
@@ -225,11 +332,6 @@
dnl ###########################################################################
dnl ###########################################################################
-
-
-
-
-
dnl prefix
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_PREFIX,
@@ -292,12 +394,25 @@
src/plugins/Makefile
])
-echo -e "\nBuild summary:"
-echo "------------------------"
-
-AC_MSG_RESULT([
-Install in: $prefix
-
- ])
-
+#####################################################################
+## Info
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+echo
+echo " EWL plugin..............: $have_ewl"
+echo " ETK plugin..............: $have_etk"
+echo " Thumbnailing............: $have_libpng"
+echo " Imlib2..................: $have_imlib2"
+echo
+echo "Installation Path.........: $prefix"
+echo
+echo "Compilation...............: make"
+echo "Installation..............: make install"
+echo
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
