From aec4c082f3639bfba0e869b793379014843214c0 Mon Sep 17 00:00:00 2001
From: Joe Myre <joemyre@users.sourceforge.net>
Date: Thu, 4 Aug 2005 18:11:34 +0000
Subject: [PATCH] Set package version variables in autogen.sh to remove
 hardcode

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@56 7f574dfc-610e-0410-a909-a81674777703
---
 Conky.kdevelop | 52 +++++++++++++++++++++++++-------------------------
 autogen.sh     | 21 ++++++++++++--------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/Conky.kdevelop b/Conky.kdevelop
index 970a4448..9f9fe1db 100644
--- a/Conky.kdevelop
+++ b/Conky.kdevelop
@@ -9,7 +9,7 @@
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
     <versioncontrol/>
     <secondaryLanguages/>
   </general>
@@ -22,7 +22,7 @@
       <mainprogram>conky</mainprogram>
       <directoryradio>build</directoryradio>
       <customdirectory>/</customdirectory>
-      <programargs></programargs>
+      <programargs/>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
       <envvars/>
@@ -39,14 +39,14 @@
         <cflags>-O2 -pipe</cflags>
         <envvars/>
         <configargs>--prefix=/usr --enable-mpd --enable-xft --enable-seti --enable-double-buffer --enable-own-window --enable-metar --enable-mldonkey</configargs>
-        <topsourcedir></topsourcedir>
-        <cppflags></cppflags>
-        <ldflags></ldflags>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
-        <cxxflags></cxxflags>
-        <f77flags></f77flags>
+        <topsourcedir/>
+        <cppflags/>
+        <ldflags/>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
+        <cxxflags/>
+        <f77flags/>
       </optimized>
       <debug>
         <configargs>--enable-debug=full --prefix=/usr --enable-xft --enable-double-buffer --enable-own-window --enable-metar --enable-mldonkey</configargs>
@@ -56,14 +56,14 @@
         <f77compiler>kdevpgf77options</f77compiler>
         <cflags>-O2 -Wall</cflags>
         <envvars/>
-        <topsourcedir></topsourcedir>
-        <cppflags></cppflags>
-        <ldflags></ldflags>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
+        <topsourcedir/>
+        <cppflags/>
+        <ldflags/>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
         <cxxflags>-O2 -Wall</cxxflags>
-        <f77flags></f77flags>
+        <f77flags/>
       </debug>
     </configurations>
     <make>
@@ -74,18 +74,18 @@
       <abortonerror>true</abortonerror>
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
-      <makebin></makebin>
+      <makebin/>
       <prio>0</prio>
     </make>
   </kdevautoproject>
   <kdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <programargs/>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -192,9 +192,9 @@
   </cppsupportpart>
   <kdevdocumentation>
     <projectdoc>
-      <docsystem></docsystem>
-      <docurl></docurl>
-      <usermanualurl></usermanualurl>
+      <docsystem/>
+      <docurl/>
+      <usermanualurl/>
     </projectdoc>
   </kdevdocumentation>
   <ctagspart>
diff --git a/autogen.sh b/autogen.sh
index 2d52bd5d..8d9ec51c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,29 +1,34 @@
 #!/bin/sh
 
-if [ -x aclocal-1.9 ]
+alocver=1.9
+aheadver=2.59
+amakever=1.9
+aconfver=2.59
+
+if [ -x aclocal-$alocver ]
 then
-	aclocal-1.9
+	aclocal-$alocver
 else
 	aclocal
 fi
 
-if [ -x autoheader-2.59 ]
+if [ -x autoheader-$aheadver ]
 then
-	autoheader-2.59
+	autoheader-$aheadver
 else
 	autoheader
 fi
 
-if [ -x automake-1.9 ]
+if [ -x automake-$amakever ]
 then
-	automake-1.9 -a
+	automake-$amakever -a
 else
 	automake
 fi
 
-if [ -x autoconf-2.59 ]
+if [ -x autoconf-$aconfver ]
 then
-	autoconf-2.59
+	autoconf-$aconfver
 else
 	autoconf
 fi