Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/epsilon
Dir : e17/libs/epsilon
Modified Files:
Makefile.am configure.in
Log Message:
autostuff improvements:
* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
and check the required minimal versions.
* add bzipped distribution archive
* add AC_LIBTOOL_WIN32_DLL
* forbid libtool to check fortran and c++ compilers
* compute libtool versioning from the version of the package
* pass the directories based on ${prefix} to the preoprocessor
with the -D option
* replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
* remove useless -L flags in *_la_LDFLAGS
* remove Makefile.in on maintainer-clean rule
===================================================================
RCS file: /cvs/e/e17/libs/epsilon/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 10 Jul 2007 00:13:25 -0000 1.11
+++ Makefile.am 11 Nov 2007 10:11:19 -0000 1.12
@@ -6,18 +6,7 @@
config.h.in config.sub configure install-sh \
ltconfig ltmain.sh missing mkinstalldirs \
stamp-h.in epsilon_docs.tar epsilon.c \
- epsilon.spec epsilon.pc
-
-install-data-local:
- @$(NORMAL_INSTALL)
- if test -d $(srcdir)/data; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
- for d in $(srcdir)/data/*; do \
- cp -pR $$d $(DESTDIR)$(pkgdatadir)/data; \
- done \
- fi
-
-bin_SCRIPTS =
+ epsilon.spec epsilon.pc depcomp
EXTRA_DIST = README AUTHORS COPYING epsilon.spec.in epsilon.spec gendoc \
Doxyfile debian/changelog debian/changelog.in debian/rules \
===================================================================
RCS file: /cvs/e/e17/libs/epsilon/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- configure.in 7 Nov 2007 20:42:23 -0000 1.35
+++ configure.in 11 Nov 2007 10:11:19 -0000 1.36
@@ -1,7 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(epsilon, 0.3.0.011)
+AC_INIT(epsilon, 0.3.0.011, [EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
+
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(src/config.h)
AC_ISC_POSIX
@@ -10,27 +13,32 @@
AC_HEADER_STDC
AC_C_BIGENDIAN
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
-dnl Use -Wall if we have gcc.
-changequote(,)dnl
-if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wall " ;;
- esac
-fi
-changequote([,])dnl
+AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
+
+VMAJ=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $1);}'`
+VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $2);}'`
+VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $3);}'`
+SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $4);}'`
+version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
+AC_SUBST(version_info)
-PKG_CHECK_MODULES(IMLIB2, [imlib2 >= 1.0.0],
- [ have_imlib2="yes" ],
- [
- have_imlib2="no"
- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?)
+PKG_CHECK_MODULES(IMLIB2, [imlib2 >= 1.0.0])
+
+PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
+
+PKG_CHECK_MODULES(ECORE, [
+ ecore-evas >= 0.9.9
+ ecore-file >= 0.9.9
+ ecore-ipc >= 0.9.9
]
)
+PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
+
dnl Make sure the epeg header/lib is available
PKG_CHECK_MODULES(EPEG, [epeg >= 0.9.0],
[
@@ -62,20 +70,6 @@
AC_PATH_PROG(PERL, perl, 0)
AC_SUBST(PERL)
-PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
-
-PKG_CHECK_MODULES(ECORE, [
- ecore-evas >= 0.9.9
- ecore-file >= 0.9.9
- ecore-ipc >= 0.9.9
- ]
-)
-
-epdf=""
-PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
-PKG_CHECK_MODULES(EPDF, [epdf >= 0.1], epdf="yes", epdf="no")
-AM_CONDITIONAL(HAVE_EPDF, test $epdf = "yes")
-
xine=""
AC_MSG_CHECKING(whether the xine thumbnailer was explicitly disabled)
AC_ARG_ENABLE(thumbnailer-xine,
AC_HELP_STRING([--enable-thumbnailer-xine],[build the thumbnailer for videos]),
@@ -99,7 +93,7 @@
fi
AM_CONDITIONAL(HAVE_XINE, test $xine = "xine")
-requirements="imlib2 evas ecore-evas ecore-file ecore-con edje"
+requirements="imlib2 evas ecore-evas ecore-file ecore-ipc edje"
AC_SUBST(requirements)
#####################################################################
@@ -118,12 +112,27 @@
debian/changelog
])
+
+#####################################################################
+## Info
+
echo
-echo "Finished configuring $PACKAGE $VERSION"
echo
-echo "Support for freedesktop png thumbnailing .... $have_png"
-echo "Support for epeg thumbnail extension .... $have_epeg"
echo
-echo "Now type 'make' (gmake on some systems) to compile $PACKAGE"
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+echo
+echo " Thumbnail support....:"
+echo
+echo " freedesktop png....: $have_png"
+echo " epeg...............: $have_epeg"
+echo
+echo " Compilation..........: make"
+echo
+echo " Installation.........: make install"
+echo
+echo " prefix.............: $prefix"
echo
-
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
