Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/epeg
Dir : e17/libs/epeg
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/epeg/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Makefile.am 10 Jul 2007 00:13:25 -0000 1.14
+++ Makefile.am 11 Nov 2007 10:03:24 -0000 1.15
@@ -5,28 +5,9 @@
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in epeg.c \
+ stamp-h.in epeg.c depcomp \
epeg.spec debian/changelog
-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
-
-dist-hook:
- if test -d data; then \
- mkdir $(distdir)/data; \
- for file in data/*; do \
- cp -pR $$file $(distdir)/data; \
- done \
- fi
-
-bin_SCRIPTS =
-
EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
epeg.spec epeg.spec.in epeg.c.in gendoc \
Doxyfile \
@@ -35,7 +16,7 @@
debian/control \
debian/copyright \
debian/libepeg0-dev.install \
- debian/epeg0-bin.install \
+ debian/epeg0-bin.install \
debian/libepeg0.install \
debian/rules
===================================================================
RCS file: /cvs/e/e17/libs/epeg/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- configure.in 26 Aug 2007 14:33:40 -0000 1.23
+++ configure.in 11 Nov 2007 10:03:24 -0000 1.24
@@ -3,8 +3,11 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(epeg, 0.9.0.011)
+AC_INIT(epeg, 0.9.0.011, [EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
+
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
AC_ISC_POSIX
@@ -12,70 +15,22 @@
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+
+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)
dnl AC_CHECK_FUNCS(fmemopen)
dnl AC_CHECK_FUNCS(open_memstream)
-if test "x${bindir}" = 'x${exec_prefix}/bin'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
- else
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
- fi
-fi
-
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
- else
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
- fi
-fi
-
-dnl Set PACKAGE_BIN_DIR in config.h.
-if test "x${bindir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin",
[Installation directory for user executables])
- else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation
directory for user executables])
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for
user executables])
-fi
-
-dnl Set PACKAGE_LIB_DIR in config.h.
-if test "x${libdir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib",
[Installation directory for libraries])
- else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation
directory for libraries])
- fi
-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])
-
my_includes=""
my_libs="-ljpeg"
AC_SUBST(my_includes)
@@ -91,3 +46,23 @@
src/bin/Makefile
debian/changelog
])
+
+
+#####################################################################
+## Info
+
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+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
