summaryrefslogtreecommitdiff
path: root/gl/m4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2009-06-08 13:50:09 +0200
committerSimon Josefsson <simon@josefsson.org>2009-06-08 13:50:09 +0200
commit39cde3c5c692a7593e7a54f741833271c10d3e77 (patch)
treef9fe3a40cbc74384ab4ebce1c47e89eeb9d99534 /gl/m4
parent70ad60dfb9cd27f4f3ab55809357cd99750c6602 (diff)
downloadlibtasn1-39cde3c5c692a7593e7a54f741833271c10d3e77.tar.gz
libtasn1-39cde3c5c692a7593e7a54f741833271c10d3e77.tar.bz2
libtasn1-39cde3c5c692a7593e7a54f741833271c10d3e77.zip
Update gnulib files.
Diffstat (limited to 'gl/m4')
-rw-r--r--gl/m4/gnulib-comp.m42
-rw-r--r--gl/m4/version-etc.m433
2 files changed, 35 insertions, 0 deletions
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index a716362..3fae312 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -68,6 +68,7 @@ AC_DEFUN([gl_INIT],
gl_STDINT_H
gl_STDLIB_H
gl_UNISTD_H
+ gl_VERSION_ETC
AC_SUBST([WARN_CFLAGS])
gl_WCHAR_H
m4_ifval(gl_LIBSOURCES_LIST, [
@@ -240,6 +241,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/stdint.m4
m4/stdlib_h.m4
m4/unistd_h.m4
+ m4/version-etc.m4
m4/warnings.m4
m4/wchar.m4
m4/wint_t.m4
diff --git a/gl/m4/version-etc.m4 b/gl/m4/version-etc.m4
new file mode 100644
index 0000000..14d6eb6
--- /dev/null
+++ b/gl/m4/version-etc.m4
@@ -0,0 +1,33 @@
+# version-etc.m4 serial 1
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+dnl $1 - configure flag and define name
+dnl $2 - human readable description
+m4_define([gl_VERSION_ETC_FLAG],
+[dnl
+ AC_ARG_WITH([$1], [AS_HELP_STRING([--with-$1], [$2])],
+ [dnl
+ case $withval in
+ yes|no) ;;
+ *) AC_DEFINE_UNQUOTED(AS_TR_CPP([PACKAGE_$1]), ["$withval"], [$2]) ;;
+ esac
+ ])
+])
+
+AC_DEFUN([gl_VERSION_ETC],
+[dnl
+ gl_VERSION_ETC_FLAG([packager],
+ [String identifying the packager of this software])
+ gl_VERSION_ETC_FLAG([packager-version],
+ [Packager-specific version information])
+ gl_VERSION_ETC_FLAG([packager-bug-reports],
+ [Packager info for bug reports (URL/e-mail/...)])
+ if test "X$with_packager" = "X" && \
+ test "X$with_packager_version$with_packager_bug_reports" != "X"
+ then
+ AC_MSG_ERROR([The --with-packager-{bug-reports,version} options require --with-packager])
+ fi
+])