configure improvements:

* add libtool versioning from the package version (from raster's
   management of package version)
 * replace AM_PROG_LIBTOOL(deprecated) by AC_PROG_LIBTOOL
 * remove AM_ENABLE_SHARED as shared lib is built by default
 * add AC_LIBTOOL_WIN32_DLL for libraries ported to Windows (tm)
 * remove the libtool checks of c++ and fortran compilers
 * remove PACKAGE_*_DIR from configure.in and define them in
   Makefile.am as bindir and al. are expanded in them.

please report any problem that these changes can add


SVN revision: 31999

legacy/edje/configure.in

@@ -7,7 +7,9 @@ AC_INIT(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(edje, 0.5.0.041)
+
+VER=0.5.0.041
+AM_INIT_AUTOMAKE(edje, $VER)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -15,8 +17,18 @@ AM_PROG_CC_STDC
 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
+
+VMAJ=`echo $VER | awk -F . '{printf("%s", $1);}'`
+VMIN=`echo $VER | awk -F . '{printf("%s", $2);}'`
+VMIC=`echo $VER | awk -F . '{printf("%s", $3);}'`
+SNAP=`echo $VER | awk -F . '{printf("%s", $4);}'`
+version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
+AC_SUBST(version_info)
+
 AC_FUNC_ALLOCA
 
 create_shared_lib=""
@@ -51,35 +63,6 @@ fi
 
 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 ], [

legacy/edje/src/bin/Makefile.am

@@ -5,9 +5,9 @@ INCLUDES = \
 -I$(top_srcdir)/bin \
 -I$(top_srcdir)/src/lib \
 @EDJE_CFLAGS@ \
--DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
--DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
--DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
 
 bin_SCRIPTS = \
 @EDJE_RECC_PRG@

legacy/edje/src/lib/Makefile.am

@@ -39,5 +39,5 @@ edje_textblock_styles.c
 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@