On Sun, 30 Sep 2007, Michael Jennings wrote:
Most of that sounds fine, but why not provide us with a sample
configure.in with examples of all 5 changes made to it so we can get a
more concrete idea of what you're wanting to do? Then if people have
any specific objections, they're easier to note.
I've attached a patch for (for instance) edje, that shows the
modifications I want to do.
I've put the libtool doc about its versioning, but it's not necessary to
include it in configure.in.
so, what is good ? what is not correct ?
Vincent
Index: configure.in
===================================================================
RCS file: /cvs/e/e17/libs/edje/configure.in,v
retrieving revision 1.86
diff -u -r1.86 configure.in
--- configure.in 8 Sep 2007 18:36:22 -0000 1.86
+++ configure.in 2 Oct 2007 16:25:13 -0000
@@ -15,8 +15,37 @@
AM_PROG_CC_C_O
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
+
+dnl From GNU Libtoool 1.2 manual:
+dnl 1. Start with version information of `0:0:0' for each libtool library.
+dnl
+dnl 2. Update the version information only immediately before a public
+dnl release of your software. More frequent updates are unnecessary,
+dnl and only guarantee that the current interface number gets larger
+dnl faster.
+dnl
+dnl 3. If the library source code has changed at all since the last
+dnl update, then increment REVISION (`C:R:A' becomes `C:R+1:A').
+dnl
+dnl 4. If any interfaces have been added, removed, or changed since the
+dnl last update, increment CURRENT, and set REVISION to 0.
+dnl
+dnl 5. If any interfaces have been added since the last public release,
+dnl then increment AGE.
+dnl
+dnl 6. If any interfaces have been removed since the last public release,
+dnl then set AGE to 0.
+
+INTERFACE_CURRENT="5"
+INTERFACE_REVISION="0"
+INTERFACE_AGE="5"
+version_info=${INTERFACE_CURRENT}:${INTERFACE_REVISION}:${INTERFACE_AGE}
+AC_SUBST(version_info)
+
AC_FUNC_ALLOCA
create_shared_lib=""
@@ -51,35 +80,6 @@
AC_SUBST(fnmatch_libs)
-if test "x${bindir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
- else
- PACKAGE_BIN_DIR="${prefix}/bin"
- fi
-else
- PACKAGE_BIN_DIR="${bindir}"
-fi
-AC_SUBST(PACKAGE_BIN_DIR)
-
-if test "x${libdir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
- else
- PACKAGE_LIB_DIR="${prefix}/lib"
- fi
-else
- PACKAGE_LIB_DIR="${libdir}"
-fi
-AC_SUBST(PACKAGE_LIB_DIR)
-
-if test "x${prefix}" = "xNONE"; then
- PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
-else
- PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
-fi
-AC_SUBST(PACKAGE_DATA_DIR)
-
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
], [
Index: src/bin/Makefile.am
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/Makefile.am,v
retrieving revision 1.40
diff -u -r1.40 Makefile.am
--- src/bin/Makefile.am 8 Sep 2007 18:34:40 -0000 1.40
+++ src/bin/Makefile.am 2 Oct 2007 16:25:13 -0000
@@ -5,9 +5,9 @@
-I$(top_srcdir)/bin \
-I$(top_srcdir)/src/lib \
@EDJE_CFLAGS@ \
--DPACKAGE_BIN_DIR=\"@[EMAIL PROTECTED]" \
--DPACKAGE_LIB_DIR=\"@[EMAIL PROTECTED]" \
--DPACKAGE_DATA_DIR=\"@[EMAIL PROTECTED]"
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
bin_SCRIPTS = \
@EDJE_RECC_PRG@
Index: src/lib/Makefile.am
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/Makefile.am,v
retrieving revision 1.35
diff -u -r1.35 Makefile.am
--- src/lib/Makefile.am 26 Aug 2007 12:54:51 -0000 1.35
+++ src/lib/Makefile.am 2 Oct 2007 16:25:13 -0000
@@ -39,5 +39,5 @@
libedje_la_LIBADD = -lm @EDJE_LIBS@ @fnmatch_libs@
libedje_la_CPPFLAGS =
libedje_la_DEPENDENCIES = $(top_builddir)/config.h
-libedje_la_LDFLAGS = @create_shared_lib@ -version-info 5:0:5
+libedje_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
