Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 04:17:33 +00:00
Code Issues Releases Activity

autotool changes

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@786 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2006-11-21 07:31:42 +00:00
parent 776700b018
commit 3cc60c2dc2
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -8,11 +8,15 @@ AUTOMAKE_OPTIONS = \
EXTRA_DIST = \ EXTRA_DIST = \
autogen.sh \ autogen.sh \
configure.ac.in \
extras/nano/README \ extras/nano/README \
extras/nano/conky.nanorc \ extras/nano/conky.nanorc \
extras/vim/README \ extras/vim/README \
extras/vim/ftdetect/conkyrc.vim \ extras/vim/ftdetect/conkyrc.vim \
extras/vim/syntax/conkyrc.vim extras/vim/syntax/conkyrc.vim
DISTCLEANFILES = \
configure.ac
distclean-local: distclean-local:
/bin/rm -rf *.cache *~ /bin/rm -rf *.cache *~

19
autogen.sh
View File

@ -1,14 +1,23 @@
#!/bin/sh #!/bin/sh
# $Id$ # $Id$
# autogen.sh
# optional $1 = full path to svn local working repository
AUTOCONF=${AUTOCONF:-autoconf} AUTOCONF=${AUTOCONF:-autoconf}
AUTOMAKE=${AUTOMAKE:-automake} AUTOMAKE=${AUTOMAKE:-automake}
ACLOCAL=${ACLOCAL:-aclocal} ACLOCAL=${ACLOCAL:-aclocal}
AUTOHEADER=${AUTOHEADER:-autoheader} AUTOHEADER=${AUTOHEADER:-autoheader}
LIBTOOLIZE=${LIBTOOLIZE:-libtoolize} LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
WORKINGREPO=${1:-.}
$ACLOCAL # substitute svn revision
$LIBTOOLIZE --force revision=`LC_ALL=C svn info ${WORKINGREPO} | awk '/^Revision: / {printf "%05d\n", $2}'`
$AUTOHEADER sed -e "s/@REVISION@/${revision}/g" \
$AUTOMAKE -a < "configure.ac.in" > "configure.ac"
$AUTOCONF
echo Running $ACLOCAL ... && $ACLOCAL
echo Running $LIBTOOLIZE --force ... && $LIBTOOLIZE --force
echo Running $AUTOHEADER ... && $AUTOHEADER
echo Running $AUTOMAKE -a ... && $AUTOMAKE -a
echo Running $AUTOCONF ... && $AUTOCONF

7
configure.ac → configure.ac.in
View File

@ -1,3 +1,5 @@
dnl $Id$
dnl major, minor and micro version macros. dnl major, minor and micro version macros.
m4_define([conky_version_major], [1]) m4_define([conky_version_major], [1])
m4_define([conky_version_minor], [4]) m4_define([conky_version_minor], [4])
@ -6,10 +8,7 @@ m4_define([conky_version_micro], [5])
dnl conky_version_tag() macro. change [svn] to [] for releases. dnl conky_version_tag() macro. change [svn] to [] for releases.
m4_define([conky_version_tag], [svn]) m4_define([conky_version_tag], [svn])
dnl conky_version_revision() macro creates svn revision string, e.g. r784. m4_define([conky_version_revision],[r@REVISION@])
m4_define([conky_version_revision],[r`svn info | grep "^Revision:" | sed -e "s/^Revision: \(.*\)/\1/"`])
dnl conky_version() macro creates e.g. 1.4.5 for releases or 1.4.5-svn-r784 for svn versions.
m4_define([conky_version], m4_define([conky_version],
[conky_version_major().conky_version_minor().conky_version_micro()ifelse( [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
conky_version_tag(), [svn], conky_version_tag(), [svn],