[torquedev] [Bug 179] autogen.sh tries to use incorrect m4 directory

bugzilla-daemon at supercluster.org bugzilla-daemon at supercluster.org
Fri Apr 27 01:30:28 MDT 2012


http://www.clusterresources.com/bugzilla/show_bug.cgi?id=179

rhys.hill at adelaide.edu.au changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Blocks|                            |180

--- Comment #1 from rhys.hill at adelaide.edu.au 2012-04-27 01:30:28 MDT ---
The patch below fixes configure.ac so that it works with automake-1.9, which is
all that's available on RHEL 5. It also resolves bug 180, by putting an
explicit check for pkg-config at the start, rather than waiting for the first
pkg check to occur, as was the case previously.

Index: configure.ac
===================================================================
--- configure.ac    (revision 6044)
+++ configure.ac    (working copy)
@@ -37,8 +37,11 @@
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])

-LT_INIT
+dnl Enable libtool
+AC_PROG_LIBTOOL

+dnl Ensure we have pkg-config
+PKG_PROG_PKG_CONFIG

 AC_CHECK_PROGS(MAKE,$MAKE make gmake,error)
 if test "x$MAKE" = "xerror" ;then
@@ -111,10 +114,9 @@
 ])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")

-m4_ifdef([AM_SILENT_RULES],[
-  if test "x$have_check" = "xyes"; then
-    AM_SILENT_RULES(no)
-    AC_CONFIG_FILES(src/cmds/test/Makefile
+AS_IF([test "x$have_check" = "xyes"],[
+  AC_CONFIG_FILES(
+    src/cmds/test/Makefile
     src/cmds/test/MXML/Makefile
     src/cmds/test/common_cmds/Makefile
     src/cmds/test/pbs_track/Makefile
@@ -446,12 +448,19 @@
     src/tools/test/printjob/Makefile
     src/tools/test/printserverdb/Makefile
     src/tools/test/printtracking/Makefile
-    src/tools/test/tracejob/Makefile)
-  else
-    AM_SILENT_RULES(no)
-  fi
+    src/tools/test/tracejob/Makefile
+  )
 ])

+dnl
+dnl  ######################################################################
+dnl If unit-testing, disable silent rules. Set a variable so that old
+dnl automake doesn't create an invalid configure script
+AS_IF([test "x$have_check" = "xyes"],[
+ 
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])],[DUMMY_VARIABLE_FOR_OLD_AUTOMAKE=1])
+],[
+ 
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],[DUMMY_VARIABLE_FOR_OLD_AUTOMAKE=1])
+])

 dnl
 dnl  ######################################################################

-- 
Configure bugmail: http://www.clusterresources.com/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.


More information about the torquedev mailing list