Changeset 14 for trunk


Ignore:
Timestamp:
04/20/11 17:52:49 (13 years ago)
Author:
mmamonski
Message:

forgot to save ;-)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/ax_pbs.m4

    r12 r14  
    2222# 
    2323#   Written by Łukasz Cieśnik <lukasz.ciesnik@gmail.com> 
    24 #   and placed under Public Domain 
     24#   and placed under Public Domain.  
     25#    
     26#   Further contribution: Mariusz Mamonski <mamonski@man.poznan.pl>  
    2527# 
    2628 
     
    2830AC_ARG_WITH([pbs], [AC_HELP_STRING([--with-pbs=<pbs-prefix>], 
    2931                [Path to existing PBS installation root])]) 
     32AC_ARG_ENABLE([disable-pbs-log], [AC_HELP_STRING([--disable-pbs-log], 
     33                [Do not use liblog while linking with PBS Professional])]) 
     34                 
    3035AC_SUBST(PBS_INCLUDES) 
    3136AC_SUBST(PBS_LIBS) 
     
    4146                PBS_HOME=`dirname $T2` 
    4247                PBS_INCLUDES="-I${PBS_HOME}/include " 
    43                 PBS_LDFLAGS="-L${PBS_HOME}/lib " 
     48                PBS_LDFLAGS="-L${PBS_HOME}/lib " 
    4449        fi 
    4550fi 
     
    5358 
    5459AH_TEMPLATE([PBS_PROFESSIONAL], [compiling against PBS Professional]) 
     60AH_TEMPLATE([PBS_PROFESSIONAL_NO_LOG], [Do not use liblog while linking with PBS Professional]) 
     61 
     62AS_IF([test "x$enable_foo" != "xno"], [ 
     63  dnl Do the stuff needed for enabling the feature 
     64]) 
     65 
     66if test x"$enable-pbs-log" != "xno"; then 
     67        ax_pbs_lib_log=" -llog" 
     68else 
     69        ax_pbs_lib_log="" 
     70        AC_DEFINE(PBS_PROFESSIONAL_NO_LOG,[1]) 
     71fi 
    5572 
    5673if test x"$ax_pbs_ok" = xno; then 
     
    5976        AC_CHECK_LIB([log], [pbse_to_txt], [:], [ax_pbs_ok="no"]) 
    6077        if test x"$ax_pbs_ok" = xyes; then 
    61                 ax_pbs_libs="-lpbs -llog" 
     78                ax_pbs_libs="-lpbs $ax_pbs_lib_log" 
    6279        fi 
    6380fi 
     
    7188        AC_CHECK_LIB([log], [pbse_to_txt], [:], [ax_pbs_ok="no"], [-lssl -lcrypto] ) 
    7289        if test x"$ax_pbs_ok" = xyes; then 
    73                 ax_pbs_libs="-lpbs -llog -lssl -lcrypto" 
     90                ax_pbs_libs="-lpbs $ax_pbs_lib_log -lssl -lcrypto" 
    7491        fi 
    7592fi 
Note: See TracChangeset for help on using the changeset viewer.