Changeset 14 for trunk

Timestamp:

04/20/11 17:52:49 (14 years ago)

Author:

mmamonski

Message:

forgot to save ;-)

File:

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

trunk/m4/ax_pbs.m4

@@ -22 +22 @@
 #
 #   Written by Łukasz Cieśnik <lukasz.ciesnik@gmail.com>
-#   and placed under Public Domain
+#   and placed under Public Domain. 
+#   
+#   Further contribution: Mariusz Mamonski <mamonski@man.poznan.pl> 
 #
 
@@ -28 +30 @@
 AC_ARG_WITH([pbs], [AC_HELP_STRING([--with-pbs=<pbs-prefix>],
                 [Path to existing PBS installation root])])
+AC_ARG_ENABLE([disable-pbs-log], [AC_HELP_STRING([--disable-pbs-log],
+                [Do not use liblog while linking with PBS Professional])])
+                
 AC_SUBST(PBS_INCLUDES)
 AC_SUBST(PBS_LIBS)
@@ -41 +46 @@
                 PBS_HOME=`dirname $T2`
                 PBS_INCLUDES="-I${PBS_HOME}/include "
-                PBS_LDFLAGS="-L${PBS_HOME}/lib "
+                PBS_LDFLAGS="-L${PBS_HOME}/lib "
         fi
 fi
@@ -53 +58 @@
 
 AH_TEMPLATE([PBS_PROFESSIONAL], [compiling against PBS Professional])
+AH_TEMPLATE([PBS_PROFESSIONAL_NO_LOG], [Do not use liblog while linking with PBS Professional])
+
+AS_IF([test "x$enable_foo" != "xno"], [
+  dnl Do the stuff needed for enabling the feature
+])
+
+if test x"$enable-pbs-log" != "xno"; then
+        ax_pbs_lib_log=" -llog"
+else
+        ax_pbs_lib_log=""
+        AC_DEFINE(PBS_PROFESSIONAL_NO_LOG,[1])
+fi
 
 if test x"$ax_pbs_ok" = xno; then
@@ -59 +76 @@
         AC_CHECK_LIB([log], [pbse_to_txt], [:], [ax_pbs_ok="no"])
         if test x"$ax_pbs_ok" = xyes; then
-                ax_pbs_libs="-lpbs -llog"
+                ax_pbs_libs="-lpbs $ax_pbs_lib_log"
         fi
 fi
@@ -71 +88 @@
         AC_CHECK_LIB([log], [pbse_to_txt], [:], [ax_pbs_ok="no"], [-lssl -lcrypto] )
         if test x"$ax_pbs_ok" = xyes; then
-                ax_pbs_libs="-lpbs -llog -lssl -lcrypto"
+                ax_pbs_libs="-lpbs $ax_pbs_lib_log -lssl -lcrypto"
         fi
 fi