summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--THANKS1
-rw-r--r--configure.ac10
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gcrypt.h.in5
5 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f40a615b..d774a4cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15 Werner Koch <wk@g10code.com>
+
+ * configure.ac (emacs_local_vars_begin)
+ (emacs_local_vars_read_only, emacs_local_vars_end): New.
+
2010-01-21 Werner Koch <wk@g10code.com>
* compat/Makefile.am: New.
diff --git a/THANKS b/THANKS
index 861ac555..10d5384a 100644
--- a/THANKS
+++ b/THANKS
@@ -7,6 +7,7 @@ Allan Clark allanc@sco.com
Anand Kumria wildfire@progsoc.uts.edu.au
Andreas Metzler ametzler at downhill.at.eu.org
Ariel T Glenn ariel@columbia.edu
+Aurelien Jarno aurel32 at debian.org
Ben Hutchings ben decadent org uk
Bodo Moeller Bodo_Moeller@public.uni-hamburg.de
Brenno de Winter brenno@dewinter.com
diff --git a/configure.ac b/configure.ac
index 0022c291..da41225f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,11 @@ m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
+m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
+ | awk '/^\* / {printf "%s",$3}']))
AC_INIT([libgcrypt],
- [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
+ [my_version[]m4_if(my_issvn,[yes],
+ [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
[bug-libgcrypt@gnupg.org])
# LT Version numbers, remember to change them just *before* a release.
# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
@@ -1140,6 +1143,11 @@ AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
[Subversion revision used to build this package])
+# Substitutions to set generated files in a Emacs buffer to read-only.
+AC_SUBST(emacs_local_vars_begin, ['Local Variables:'])
+AC_SUBST(emacs_local_vars_read_only, ['buffer-read-only: t'])
+AC_SUBST(emacs_local_vars_end, ['End:'])
+
# And create the files.
AC_CONFIG_FILES([
diff --git a/src/ChangeLog b/src/ChangeLog
index fe541dd6..ff5cc54d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15 Werner Koch <wk@g10code.com>
+
+ * gcrypt.h.in: Add autoconf template to set generated file to
+ read-only in an Emacs buffer.
+
2010-01-21 Werner Koch <wk@g10code.com>
* Makefile.am (arch_gpg_error_cflags, arch_gpg_error_libs): New.
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index f8c75b60..e5bd704c 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -1831,3 +1831,8 @@ int gcry_is_secure (const void *a) _GCRY_GCC_ATTR_PURE;
}
#endif
#endif /* _GCRYPT_H */
+/*
+@emacs_local_vars_begin@
+@emacs_local_vars_read_only@
+@emacs_local_vars_end@
+*/