[icinga-checkins] icinga.org: icinga2/master: Get rid of the 'rm -r' stuff in autogen.sh

git at icinga.org git at icinga.org
Wed Jan 30 08:42:33 CET 2013


Module: icinga2
Branch: master
Commit: 6721f681e284310c248be2e23fcb9b293499320d
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=6721f681e284310c248be2e23fcb9b293499320d

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Jan 30 08:42:13 2013 +0100

Get rid of the 'rm -r' stuff in autogen.sh

---

 autogen.sh                     |   10 +---------
 third-party/ltdl/README.icinga |    2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index de58ca4..47b4236 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -127,25 +127,17 @@ esac
 
 # verify that libtool-ltdl-devel is installed
 echo "Running libtoolize dry-run..."
-#create third-party/ltdl from configure.ac and cleanup afterwards
-tmp1=`grep "^LT_CONFIG_LTDL_DIR" configure.ac`
-tmp2=${tmp1##*\[}
 ltdldir=${tmp2%\]*}
-mkdir -p $ltdldir
 
 if ! libtoolize --quiet --copy --force ; then
   echo ""
   echo "**Error**: libtoolize cannot detect necessary files."
   echo ""
-  echo "Make sure libtool-ltdl-devel (rpm) / libltdl-dev (deb) or an"
+  echo "Make sure libtool-ltdl-devel (RHEL) / libltdl-dev (Debian) or an"
   echo "appropriate package for your distribution is installed."
-  rm -r $ltdldir
   exit 1
 fi
 
-#cleanup
-rm -r $ltdldir
-
 for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print`
 do 
   dr=`dirname $coin`
diff --git a/third-party/ltdl/README.icinga b/third-party/ltdl/README.icinga
new file mode 100644
index 0000000..e3e49d5
--- /dev/null
+++ b/third-party/ltdl/README.icinga
@@ -0,0 +1,2 @@
+This directory will automatically be populated by libtoolize when you run the
+autogen.sh script.





More information about the icinga-checkins mailing list