Changeset 97 for trunk/m4

Timestamp:

11/24/13 23:24:56 (10 years ago)

Author:

mmamonski

Message:

DRMAA 1.0.17

File:

• trunk/m4/ax_pbs.m4 (modified) (6 diffs)

trunk/m4/ax_pbs.m4

@@ -38 +38 @@
 
 if test x"$with_pbs" != x; then
+        PBS_HOME=$with_pbs
         PBS_INCLUDES="-I${with_pbs}/include "
         PBS_LDFLAGS="-L${with_pbs}/lib "
@@ -50 +51 @@
 fi
 
+
+PBS_INCLUDES="$PBS_INCLUDES -I${PBS_HOME}/include/torque "
 LDFLAGS_save="$LDFLAGS"
 CPPFLAGS_save="$CPPFLAGS"
@@ -59 +62 @@
 AH_TEMPLATE([PBS_PROFESSIONAL], [compiling against PBS Professional])
 AH_TEMPLATE([PBS_PROFESSIONAL_NO_LOG], [Do not use liblog while linking with PBS Professional])
+AH_TEMPLATE([HAVE_PBS_SUBMIT_HASH], [Torque 4 pbs_submit_hash function found])
 
 if test x"$enable_pbs_log" != "xno"; then
@@ -88 +92 @@
 fi
 
+ax_pbs_submit_hash="no"
 
 if test x"$ax_pbs_ok" = xno; then
@@ -93 +98 @@
         AC_CHECK_LIB([torque], [pbs_submit], [:], [ax_pbs_ok="no"])
         AC_CHECK_LIB([torque], [pbse_to_txt], [:], [ax_pbs_ok="no"])
+        AC_CHECK_LIB([torque], [pbs_submit_hash], [AC_DEFINE(HAVE_PBS_SUBMIT_HASH) ax_pbs_submit_hash="yes"], [:])
+
+
         if test x"$ax_pbs_ok" = xyes; then
                 ax_pbs_libs="-ltorque"
@@ -99 +107 @@
         AC_DEFINE(PBS_PROFESSIONAL,[1])
 fi
+
+AM_CONDITIONAL([TORQUE4], [test x$ax_pbs_submit_hash = xyes])
 
 if test x"$ax_pbs_ok" = xyes; then