X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=autogen.sh;h=1e7d76b3bb5700e1420651d2d8fc44a0c7e91ffc;hb=fd334774172ae43c8e55aba76ce06b3d61407517;hp=509b318d40e616c33651e86afeab37e85791a7b9;hpb=c23ef2218cf650e78e6f3c3bbb51ddfe7fef54c3;p=monky

diff --git a/autogen.sh b/autogen.sh
index 509b318..1e7d76b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,34 +1,52 @@
 #!/bin/sh
+#
+# Conky, a system monitor, based on torsmo
+#
+# Any original torsmo code is licensed under the BSD license
+#
+# All code written since the fork of torsmo is licensed under the GPL
+#
+# Please see COPYING for details
+#
+# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# optional $1 = optional directory containing build tree or git working copy
 
-alocver=1.9
-aheadver=2.59
-amakever=1.9
-aconfver=2.59
+AUTOCONF=${AUTOCONF:-autoconf}
+AUTOMAKE=${AUTOMAKE:-automake}
+ACLOCAL=${ACLOCAL:-aclocal}
+AUTOHEADER=${AUTOHEADER:-autoheader}
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 
-if [ -x aclocal-$alocver ]
-then
-	aclocal-$alocver
+# identify a git revision similar to svn based on number of commits, if a git
+# working copy.  the last svn commit was rev 1274, so we'll pick up from there
+if test "$1" != "" && test -d "$1/.git"; then
+    revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`;
+elif test -d ".git"; then
+    revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`;
 else
-	aclocal
-fi
+    revision="NONE"; fi
 
-if [ -x autoheader-$aheadver ]
-then
-	autoheader-$aheadver
-else
-	autoheader
-fi
-
-if [ -x automake-$amakever ]
-then
-	automake-$amakever -a
-else
-	automake -a
-fi
+# generate configure.ac with substituted git revision
+sed -e "s/@REVISION@/${revision}/g" < "configure.ac.in" > "configure.ac"
 
-if [ -x autoconf-$aconfver ]
-then
-	autoconf-$aconfver
-else
-	autoconf
-fi
+touch README # in case it doesn't exist
+echo Running $ACLOCAL -I m4 ... && $ACLOCAL -I m4
+echo Running $LIBTOOLIZE --force --copy ... && $LIBTOOLIZE --force --copy
+echo Running $AUTOHEADER ... && $AUTOHEADER
+echo Running $AUTOMAKE --add-missing --copy --gnu ... && $AUTOMAKE --add-missing --copy --gnu
+echo Running $AUTOCONF ... && $AUTOCONF