Changeset 236

Timestamp:

04/28/10 15:03:22 (14 years ago)

Author:

bas

Message:

Added an new variable:

• pbs_library_compile_line
• pbs_library_dir (pbs-config --libdir)

Location:

trunk

Files:

• configure (modified) (5 diffs)
• configure.in (modified) (2 diffs)
• setup.py.in (modified) (2 diffs)

trunk/configure

@@ -618 +618 @@
 pbsdir
 PBSCONFIG
+pbs_library_compile_line
 pbs_library_dir
 pbs_version
@@ -1686 +1687 @@
 
 if test "$PBSCONFIG" != "none"; then
-  pbs_library_dir="`$PBSCONFIG --libs`"
+  pbs_library_compile_line="`$PBSCONFIG --libs`"
+  pbs_library_dir="`$PBSCONFIG --libdir`"
   pbs_version="`$PBSCONFIG --version`"
   { echo "$as_me:$LINENO: result: Found torque version: $pbs_version" >&5
@@ -1695 +1697 @@
    { (exit 1); exit 1; }; }
 fi
+
 
 
@@ -2492 +2495 @@
 pbsdir!$pbsdir$ac_delim
 PBSCONFIG!$PBSCONFIG$ac_delim
+pbs_library_compile_line!$pbs_library_compile_line$ac_delim
 pbs_library_dir!$pbs_library_dir$ac_delim
 pbs_version!$pbs_version$ac_delim
@@ -2506 +2510 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
     break
   elif $ac_last_try; then

trunk/configure.in

@@ -17 +17 @@
 AC_PATH_PROG(PBSCONFIG, pbs-config, none, $pbsdir:$pbsdir/bin:$pbsdir/../bin:$PATH)
 if test "$PBSCONFIG" != "none"; then
-  pbs_library_dir="`$PBSCONFIG --libs`"
+  pbs_library_compile_line="`$PBSCONFIG --libs`"
+  pbs_library_dir="`$PBSCONFIG --libdir`"
   pbs_version="`$PBSCONFIG --version`"
   AC_MSG_RESULT(Found torque version: $pbs_version)
@@ -23 +24 @@
   AC_MSG_ERROR([Failed to find program pbs-config])
 fi
+AC_SUBST(pbs_library_compile_line)
 AC_SUBST(pbs_library_dir)
 AC_SUBST(pbs_version)

trunk/setup.py.in

@@ -13 +13 @@
 # Strip off the -L it is also added by the python setup tools
 #
+PBS_LIB_COMPILE_LINE='@pbs_library_compile_line@'
 PBS_LIB_DIR='@pbs_library_dir@'
-if PBS_LIB_DIR.startswith('-L'):
-        PBS_LIB_DIR=PBS_LIB_DIR[2:]
 
 if not PBS_LIB_DIR:
@@ -22 +21 @@
         sys.exit(1)
 
-# Test if we have all the libs:
-#
 LIBS = ['torque']