[mm-common] Allow module API version suffix without a dash
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mm-common] Allow module API version suffix without a dash
- Date: Mon, 28 Dec 2009 10:41:43 +0000 (UTC)
commit 165d6d7d15e5304262d98ec6f92b8472406cda83
Author: Daniel Elstner <daniel kitta gmail com>
Date: Mon Dec 28 11:21:45 2009 +0100
Allow module API version suffix without a dash
* macros/mm-module.m4 (MM_INIT_MODULE): Adjust the regular expressions
used to extract the API version from the module name, so that the dash
separator becomes optional.
macros/mm-module.m4 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/macros/mm-module.m4 b/macros/mm-module.m4
index 2193ded..028edea 100644
--- a/macros/mm-module.m4
+++ b/macros/mm-module.m4
@@ -15,7 +15,7 @@
## You should have received a copy of the GNU General Public License
## along with mm-common. If not, see <http://www.gnu.org/licenses/>.
-#serial 20090822
+#serial 20091228
## _MM_INIT_MODULE_VERSION(basename, BASENAME, [major], [minor], [micro])
##
@@ -82,6 +82,6 @@ AC_REQUIRE([_MM_PRE_INIT])[]dnl
AC_REQUIRE([MM_CHECK_GNU_MAKE])[]dnl
_MM_INIT_MODULE_BASENAME([$1],
m4_quote(m4_ifval([$2], [$2], m4_defn([AC_PACKAGE_VERSION]))),
- m4_quote(m4_bpatsubst([$1], [-[.0123456789]+$])),
- m4_quote(m4_bregexp([$1], [-\([.0123456789]+\)$], [\1])))[]dnl
+ m4_quote(m4_bpatsubst([$1], [[-.0123456789]+$])),
+ m4_quote(m4_bregexp([$1], [-?\([.0123456789]+\)$], [\1])))[]dnl
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]