configure.ac to read version number from jabber-ourversion.el
...instead of the other way around. This should make it possible to build an ELPA-style package straight out of Git without running autoconf, while we'd still be able to build tarballs through automake.
This commit is contained in:
parent
c38945c00e
commit
c335fc5b6a
|
@ -22,11 +22,11 @@ jabber-time.el jabber-truncate.el jabber-util.el \
|
||||||
jabber-vcard-avatars.el jabber-vcard.el jabber-version.el \
|
jabber-vcard-avatars.el jabber-vcard.el jabber-version.el \
|
||||||
jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el \
|
jabber-watch.el jabber-widget.el jabber-wmii.el jabber-xmessage.el \
|
||||||
jabber-muc-nick-coloring.el \
|
jabber-muc-nick-coloring.el \
|
||||||
jabber-xml.el jabber.el srv.el jabber-tmux.el
|
jabber-xml.el jabber.el srv.el jabber-tmux.el jabber-ourversion.el
|
||||||
|
|
||||||
compat_lisp_sources = jabber-fallback-lib/hexrgb.el
|
compat_lisp_sources = jabber-fallback-lib/hexrgb.el
|
||||||
|
|
||||||
dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el jabber-ourversion.el
|
dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
|
||||||
MAINTAINERCLEANFILES=jabber-autoloads.el
|
MAINTAINERCLEANFILES=jabber-autoloads.el
|
||||||
|
|
||||||
EXTRA_DIST = jabber-pkg.el.in
|
EXTRA_DIST = jabber-pkg.el.in
|
||||||
|
|
|
@ -1,9 +1,14 @@
|
||||||
AC_INIT([jabber.el], [0.8.92], [emacs-jabber-general@lists.sourceforge.net], [emacs-jabber])
|
AC_INIT([jabber.el],
|
||||||
|
m4_esyscmd_s([sed -ne 's/^(defconst jabber-version "\(.*\)"$/\1/p' jabber-ourversion.el]),
|
||||||
|
[emacs-jabber-general@lists.sourceforge.net],
|
||||||
|
[emacs-jabber])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
dnl Need automake 1.11 for dist-xz option
|
dnl Need automake 1.11 for dist-xz option
|
||||||
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign dist-bzip2 dist-xz dist-zip])
|
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign dist-bzip2 dist-xz dist-zip])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
|
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/jabber-ourversion.el'])
|
||||||
|
|
||||||
AM_PATH_LISPDIR
|
AM_PATH_LISPDIR
|
||||||
AS_IF([test "$EMACS" = no], [AC_MSG_ERROR([cannot find Emacs])])
|
AS_IF([test "$EMACS" = no], [AC_MSG_ERROR([cannot find Emacs])])
|
||||||
|
|
||||||
|
@ -14,5 +19,5 @@ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
|
||||||
m4_ifndef([AM_GCONF_SOURCE_2], [m4_defun([AM_GCONF_SOURCE_2])])
|
m4_ifndef([AM_GCONF_SOURCE_2], [m4_defun([AM_GCONF_SOURCE_2])])
|
||||||
AM_GCONF_SOURCE_2
|
AM_GCONF_SOURCE_2
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile tests/Makefile gconf/Makefile jabber-ourversion.el])
|
AC_CONFIG_FILES([Makefile tests/Makefile gconf/Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
;; jabber-ourversion.el. Holds the version number in a format that
|
||||||
|
;; configure.ac can read.
|
||||||
|
|
||||||
|
;; On the following line, only change the part between double quotes:
|
||||||
|
(defconst jabber-version "0.8.92"
|
||||||
|
"version returned to those who query us")
|
||||||
|
|
||||||
|
(provide 'jabber-ourversion)
|
|
@ -1,7 +0,0 @@
|
||||||
;; @configure_input@
|
|
||||||
|
|
||||||
;; This value gets updated automatically when configure.ac is changed.
|
|
||||||
(defconst jabber-version "@PACKAGE_VERSION@"
|
|
||||||
"version returned to those who query us")
|
|
||||||
|
|
||||||
(provide 'jabber-ourversion)
|
|
Loading…
Reference in New Issue