Changeset 97 for trunk


Ignore:
Timestamp:
11/24/13 23:24:56 (11 years ago)
Author:
mmamonski
Message:

DRMAA 1.0.17

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r89 r97  
    1 AC_INIT([DRMAA for PBS Pro], [1.0.14], [mamonski@man.poznan.pl], [pbs-drmaa]) 
     1AC_INIT([DRMAA for PBS Pro], [1.0.17], [mamonski@man.poznan.pl], [pbs-drmaa]) 
    22AC_PREREQ(2.59) 
    33AC_REVISION([$Id$]) 
    … …  
    55DRMAA for Torque/PBS Professional 
    66Copyright (C) 2006-2009  FedStage Systems 
    7 Copyright (C) 2011  Poznan Supercomputing and Networking Center 
     7Copyright (C) 2011-2013  Poznan Supercomputing and Networking Center 
    88 
    99This program is free software: you can redistribute it and/or modify 
    … …  
    2323PBS_DRMAA_MAJOR=1 
    2424PBS_DRMAA_MINOR=0 
    25 PBS_DRMAA_MICRO=14 
    26 PBS_DRMAA_VERSION_INFO=1:14:0 
     25PBS_DRMAA_MICRO=17 
     26PBS_DRMAA_VERSION_INFO=1:17:0 
    2727AC_SUBST([PBS_DRMAA_MAJOR]) 
    2828AC_SUBST([PBS_DRMAA_MINOR]) 
    … …  
    4444# programs: 
    4545AC_PROG_CC 
     46AC_PROG_CXX 
    4647AC_PROG_CPP 
    4748AC_PROG_RANLIB 

  • trunk/m4/ax_pbs.m4

    r15 r97  
    3838 
    3939if test x"$with_pbs" != x; then 
     40        PBS_HOME=$with_pbs 
    4041        PBS_INCLUDES="-I${with_pbs}/include " 
    4142        PBS_LDFLAGS="-L${with_pbs}/lib " 
    … …  
    5051fi 
    5152 
     53 
     54PBS_INCLUDES="$PBS_INCLUDES -I${PBS_HOME}/include/torque " 
    5255LDFLAGS_save="$LDFLAGS" 
    5356CPPFLAGS_save="$CPPFLAGS" 
    … …  
    5962AH_TEMPLATE([PBS_PROFESSIONAL], [compiling against PBS Professional]) 
    6063AH_TEMPLATE([PBS_PROFESSIONAL_NO_LOG], [Do not use liblog while linking with PBS Professional]) 
     64AH_TEMPLATE([HAVE_PBS_SUBMIT_HASH], [Torque 4 pbs_submit_hash function found]) 
    6165 
    6266if test x"$enable_pbs_log" != "xno"; then 
    … …  
    8892fi 
    8993 
     94ax_pbs_submit_hash="no" 
    9095 
    9196if test x"$ax_pbs_ok" = xno; then 
    … …  
    9398        AC_CHECK_LIB([torque], [pbs_submit], [:], [ax_pbs_ok="no"]) 
    9499        AC_CHECK_LIB([torque], [pbse_to_txt], [:], [ax_pbs_ok="no"]) 
     100        AC_CHECK_LIB([torque], [pbs_submit_hash], [AC_DEFINE(HAVE_PBS_SUBMIT_HASH) ax_pbs_submit_hash="yes"], [:]) 
     101 
     102 
    95103        if test x"$ax_pbs_ok" = xyes; then 
    96104                ax_pbs_libs="-ltorque" 
    … …  
    99107        AC_DEFINE(PBS_PROFESSIONAL,[1]) 
    100108fi 
     109 
     110AM_CONDITIONAL([TORQUE4], [test x$ax_pbs_submit_hash = xyes]) 
    101111 
    102112if test x"$ax_pbs_ok" = xyes; then 

  • trunk/pbs_drmaa/Makefile.am

    r76 r97  
    3232 util.c util.h \ 
    3333 log_reader.c log_reader.h \ 
    34  pbs_conn.c pbs_conn.h 
     34 pbs_conn.c pbs_conn.h  
     35if TORQUE4 
     36libdrmaa_la_SOURCES += torque4.cpp torque4.h 
     37endif 
    3538BUILT_SOURCES       = pbs_attrib.c 
    3639EXTRA_DIST          = pbs_attrib.c 
Note: See TracChangeset for help on using the changeset viewer.