r2650 - in trunk: libmcrypto libmikey libminisip libmnetutil
libmsip libmstun libmutil libmutil/m4 milbc minisip
minisip/minisip/gui/gtkgui ministun
mikma at minisip.org
mikma at minisip.org
Fri Jun 9 18:30:00 CEST 2006
Author: mikma
Date: 2006-06-09 18:29:59 +0200 (Fri, 09 Jun 2006)
New Revision: 2650
Modified:
trunk/libmcrypto/configure.ac
trunk/libmikey/configure.ac
trunk/libminisip/configure.ac
trunk/libmnetutil/configure.ac
trunk/libmsip/configure.ac
trunk/libmstun/configure.ac
trunk/libmutil/configure.ac
trunk/libmutil/m4/libmutil.m4
trunk/milbc/configure.ac
trunk/minisip/configure.ac
trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx
trunk/ministun/configure.ac
Log:
Add "+rREV" to the version number for unreleased minisip packages.
It tries to avoid recompilation when updating from svn by defining
the version macros in separate header files called include/version.h, which
aren't included by default in all source files.
Modified: trunk/libmcrypto/configure.ac
===================================================================
--- trunk/libmcrypto/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libmcrypto/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -14,6 +14,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/libmikey/configure.ac
===================================================================
--- trunk/libmikey/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libmikey/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -14,6 +14,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/libminisip/configure.ac
===================================================================
--- trunk/libminisip/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libminisip/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -14,6 +14,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/libmnetutil/configure.ac
===================================================================
--- trunk/libmnetutil/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libmnetutil/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -14,6 +14,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/libmsip/configure.ac
===================================================================
--- trunk/libmsip/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libmsip/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -14,6 +14,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/libmstun/configure.ac
===================================================================
--- trunk/libmstun/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libmstun/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -14,6 +14,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/libmutil/configure.ac
===================================================================
--- trunk/libmutil/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libmutil/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -14,6 +14,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AC_LIBLTDL_CONVENIENCE
AM_MINISIP_LIBTOOL_EXTRAS
Modified: trunk/libmutil/m4/libmutil.m4
===================================================================
--- trunk/libmutil/m4/libmutil.m4 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/libmutil/m4/libmutil.m4 2006-06-09 16:29:59 UTC (rev 2650)
@@ -36,6 +36,61 @@
# End of m4_MINISIP_LIBRARY_VESRION
#
+# AM_MINISIP_VERSION_GEN()
+# ------------------------
+AC_DEFUN([AM_MINISIP_VERSION_GEN],[
+ if test -e ${srcdir}/.svnrevision; then
+ svnrevision=`cat ${srcdir}/.svnrevision`
+ else
+ svnrevision=`LANG=C svnversion -c ${srcdir} | cut -d: -f2`
+ fi
+
+ version="MINISIP_PACKAGE_VERSION+r${svnrevision}"
+ version_old=
+
+ if test -e version; then
+ version_old=`cat version`
+ fi
+
+ if test "$version" != "$version_old"; then
+ cat > "include/version.h" <<EOF
+#define PACKAGE_VERSION_FULL "$version"
+#define PACKAGE_STRING_FULL "${PACKAGE_NAME} $version"
+EOF
+
+ cat > "version" <<EOF
+$version
+EOF
+ else
+ echo "config.status: include/version.h is unchanged"
+ fi
+
+ VERSION_FULL=$version
+])
+# End of AM_MINISIP_VERSION_GEN
+
+# AM_MINISIP_PACKAGE_UNRELEASED()
+# ---------------------------------
+AC_DEFUN([AM_MINISIP_PACKAGE_UNRELEASED], [
+
+AC_CONFIG_COMMANDS([include/version.h], [
+ AM_MINISIP_VERSION_GEN
+],[
+ PACKAGE_NAME=$PACKAGE_NAME
+])
+
+AC_DEFINE([HAVE_VERSION_H], [1], [Define to 1 if you have `include/version.h'])
+AC_DEFINE([VERSION], [PACKAGE_VERSION_FULL], [Version number of package])
+AC_DEFINE([PACKAGE_VERSION], [PACKAGE_VERSION_FULL], [Define to the version of this package.])
+AC_DEFINE([PACKAGE_STRING], [PACKAGE_STRING_FULL], [Define to the full name and version of this package.])
+AM_MINISIP_VERSION_GEN
+
+VERSION=$VERSION_FULL
+PACKAGE_VERSION=$VERSION_FULL
+PACKAGE_STRING="${PACKAGE_NAME} ${VERSION_FULL}"
+])
+# End of AM_MINISIP_PACKAGE_UNRELEASED
+
# AM_MINISIP_PACKAGE_INIT()
# -------------------------
AC_DEFUN([AM_MINISIP_PACKAGE_INIT],[
Modified: trunk/milbc/configure.ac
===================================================================
--- trunk/milbc/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/milbc/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -12,6 +12,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/minisip/configure.ac
===================================================================
--- trunk/minisip/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/minisip/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -13,6 +13,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
Modified: trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx 2006-06-09 16:29:59 UTC (rev 2650)
@@ -64,6 +64,10 @@
# include<hildon-lgpl/hildon-widgets/hildon-appview.h>
#endif
+#ifdef HAVE_VERSION_H
+# include<version.h>
+#endif
+
#ifdef OLDLIBGLADEMM
# define SLOT(a,b) SigC::slot(a,b)
# define BIND SigC::bind
Modified: trunk/ministun/configure.ac
===================================================================
--- trunk/ministun/configure.ac 2006-06-08 21:58:11 UTC (rev 2649)
+++ trunk/ministun/configure.ac 2006-06-09 16:29:59 UTC (rev 2650)
@@ -13,6 +13,8 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(include/compilation_config.h)
AM_MINISIP_PACKAGE_INIT
+dnl Remove for released versions
+AM_MINISIP_PACKAGE_UNRELEASED
AM_MINISIP_LIBTOOL_EXTRAS
AC_PROG_LIBTOOL
More information about the Minisip-devel
mailing list