Changeset 2802 for stable

Timestamp:

Jun 28, 2013 8:52:42 AM (8 years ago)

Author:

stefan

Message:

merge r2800 and r2801 from trunk

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (2 diffs)

stable/0.7/coin.m4

@@ -57 +57 @@
 ]) # AC_COIN_CHECK_VPATH
 
-###########################################################################
-#                         COIN_PROJECTDIR_INIT                            #
-###########################################################################
-
-# This macro does everything that is required in the early part in the
-# configure script, such as defining a few variables.  This should only be used
-# in the main directory of a project directory (the one which holds the src
-# directory for the project). The first parameter is the project name. The
-# second (optional) is the libtool library version (important for releases,
-# less so for stable or trunk).
-
-AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
-[
-# As backup, we make sure we don't loose an FLIBS if it has been set
-# by the user
-save_FLIBS="$FLIBS"
-
-# A useful makefile conditional that is always false
-AM_CONDITIONAL(ALWAYS_FALSE, false)
-
-# We set the following variable so that we know later in AC_COIN_FINALIZE
-# that we are in a project main directory
-coin_projectdir=yes
-
-# Set the project's version numbers
-m4_ifvaln([$1],[
+
+###########################################################################
+#                          COIN_PROJECTVERSION                            #
+###########################################################################
+
+# This macro is used by COIN_PROJECTDIR_INIT and sets up variables related
+# to versioning numbers of the project.
+
+AC_DEFUN([AC_COIN_PROJECTVERSION],
+[m4_ifvaln([$1],[
   AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"],[Version number of project])
   
@@ -112 +96 @@
   fi
  ])
-
+ 
 # Capture libtool library version, if given.
-m4_ifvaln([$2],[coin_libversion=$2],[])
-
+ m4_ifvaln([$2],[coin_libversion=$2],[])
+])
+
+###########################################################################
+#                         COIN_PROJECTDIR_INIT                            #
+###########################################################################
+
+# This macro does everything that is required in the early part in the
+# configure script, such as defining a few variables.  This should only be used
+# in the main directory of a project directory (the one which holds the src
+# directory for the project). The first parameter is the project name. The
+# second (optional) is the libtool library version (important for releases,
+# less so for stable or trunk).
+
+AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
+[
+# As backup, we make sure we don't loose an FLIBS if it has been set
+# by the user
+save_FLIBS="$FLIBS"
+
+# A useful makefile conditional that is always false
+AM_CONDITIONAL(ALWAYS_FALSE, false)
+
+# We set the following variable so that we know later in AC_COIN_FINALIZE
+# that we are in a project main directory
+coin_projectdir=yes
+
+# Set the project's version numbers
+AC_COIN_PROJECTVERSION($1, $2)
 ]) # AC_COIN_PROJECTDIR_INIT