fixes for launchmon build

lib/spack/spack/packages/launchmon/__init__.py

@@ -30,10 +30,16 @@ class Launchmon(Package):
     force_url = True
     list_url = "http://sourceforge.net/p/launchmon/code/HEAD/tree"
 
-    versions = {'1.0.0' : 'a0e5bfb7d82dc708d58bdbf93697886c'}
+    #versions = {'1.0.0' : 'a0e5bfb7d82dc708d58bdbf93697886c'}
+    versions = {'1.0.0' : '9d1184397d3081b94e2c0577c3c605e5'}
     patch('patch.lmon_install_dir', level=0)
 
     def install(self, spec, prefix):
         configure("--prefix=" + prefix)
+
+        # TODO: remove once Jira SPACK-19 is fixed
+        import shutil
+        shutil.copy2('/usr/bin/libtool', 'libtool')
+
         make()
         make("install")

lib/spack/spack/packages/launchmon/patch.lmon_install_dir

@@ -129,3 +129,19 @@ Index: config/x_ac_bootfabric.m4
  
        if test "x$with_cobo_port" != "xcheck" -a "x$with_cobo_port" != "xyes"; then
          AC_DEFINE(COBO_BEGIN_PORT, $with_cobo_port, [Define a beginning port for COBO_BASED])
+Index: config/x_ac_gcrpyt.m4
+===================================================================
+--- config/x_ac_gcrypt.m4       2011-10-22 00:50:38.000000000 -0700
++++ config/x_ac_gcrypt.patched.m4       2014-03-14 11:33:59.189220000 -0700
+@@ -55,8 +55,8 @@
+       AC_CONFIG_SUBDIRS([tools/libgpg-error])
+       AC_SUBST(GPGERRLOC, [tools/libgpg-error/src])
+       AC_SUBST(GCRYPTLOC, [tools/libgcrypt/src])
+-      AC_SUBST(LIBGCRYPT, [-lgcrypt])
+-      AC_SUBST(LIBGPGERR, [-lgpg-error])
++      AC_SUBST(LIBGCRYPT, [libgcrypt.la])
++      AC_SUBST(LIBGPGERR, [libgpg-error.la])
+       gcrypt_configured="yes"
+     else
+       AC_MSG_ERROR([tools/libgpg-error or tools/libgcrypt not found])
+