Changeset 216

Timestamp:

04/08/10 15:31:29 (14 years ago)

Author:

bas

Message:

New configure options to determine version and where the libs are installed, borrowed from mpiexec

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (6 diffs)
• configure.in (modified) (1 diff)
• setup.py.in (modified) (2 diffs)

trunk/Makefile.in

@@ -5 +5 @@
 exec_prefix=$(PREFIX)
 BINDIR=$(PREFIX)/bin
-PBSLIB=@pbspath@
-
 
 DOCDIR=/usr/share/doc/pbs-python

trunk/configure

@@ -577 +577 @@
 PACKAGE_BUGREPORT=
 
-ac_unique_file="src/pbs.py"
+ac_unique_file="src/pbs_2.4.py"
 ac_subst_vars='SHELL
 PATH_SEPARATOR
@@ -616 +616 @@
 target_alias
 pyexecdir
-pbspath
+pbsdir
+PBSCONFIG
+pbs_library_dir
+pbs_version
 PYTHON
 PYTHON_VERSION
@@ -1199 +1202 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-
-  --with-pbsdir=PATH    directory that contains the torque libraries
+  --with-pbsdir=PATH    The torque/pbs install directory
 
 _ACEOF
@@ -1626 +1628 @@
 
 
-
+pbsdir_default=''
 
 # Check whether --with-pbsdir was given.
 if test "${with_pbsdir+set}" = set; then
-  withval=$with_pbsdir; case "${withval}" in
-        *) pbspath="${withval}" ;;
-  esac
-else
-  pbspath=""
-  pbspath=`pbs-config --libs`
-
-fi
+  withval=$with_pbsdir; pbsdir=$withval
+else
+  pbsdir=$pbsdir_default
+fi
+
+
+
+# Verify the PBS libs are there, but let Makefile handle including them
+# on the link line.  First check for modern torque pbs-config program using
+# $pbsdir and the rest of PATH, then fall back to looking around for the
+# libraries by hand.
+# Extract the first word of "pbs-config", so it can be a program name with args.
+set dummy pbs-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PBSCONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PBSCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PBSCONFIG="$PBSCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$pbsdir:$pbsdir/bin:$pbsdir/../bin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PBSCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PBSCONFIG" && ac_cv_path_PBSCONFIG="none"
+  ;;
+esac
+fi
+PBSCONFIG=$ac_cv_path_PBSCONFIG
+if test -n "$PBSCONFIG"; then
+  { echo "$as_me:$LINENO: result: $PBSCONFIG" >&5
+echo "${ECHO_T}$PBSCONFIG" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test "$PBSCONFIG" != "none"; then
+  pbs_library_dir="`$PBSCONFIG --libs`"
+  pbs_version="`$PBSCONFIG --version`"
+else
+  pbs_library_DIR=""
+  pbs_version=""
+fi
+
+
+
 
 
@@ -2430 +2487 @@
 target_alias!$target_alias$ac_delim
 pyexecdir!$pyexecdir$ac_delim
-pbspath!$pbspath$ac_delim
+pbsdir!$pbsdir$ac_delim
+PBSCONFIG!$PBSCONFIG$ac_delim
+pbs_library_dir!$pbs_library_dir$ac_delim
+pbs_version!$pbs_version$ac_delim
 PYTHON!$PYTHON$ac_delim
 PYTHON_VERSION!$PYTHON_VERSION$ac_delim
@@ -2443 +2503 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
     break
   elif $ac_last_try; then

trunk/configure.in

@@ -1 @@
-AC_INIT(src/pbs.py)
+AC_INIT(src/pbs_2.4.py)
 AC_SUBST(prefix)
 AC_SUBST(exec_prefix)
 AC_SUBST(pyexecdir)
-AC_SUBST(pbspath)
 
 
-AC_ARG_WITH(pbsdir,
-[  
-  --with-pbsdir=PATH    directory that contains the torque libraries],
+pbsdir_default=''
+AC_ARG_WITH([pbsdir],
+ [  --with-pbsdir=PATH  The torque/pbs install directory],
+  pbsdir=$withval, pbsdir=$pbsdir_default)
+AC_SUBST(pbsdir)
 
-  [case "${withval}" in
-        *) pbspath="${withval}" ;;
-  esac], 
+# Verify the PBS libs are there, but let Makefile handle including them
+# on the link line.  First check for modern torque pbs-config program using
+# $pbsdir and the rest of PATH, then fall back to looking around for the
+# libraries by hand.
+AC_PATH_PROG(PBSCONFIG, pbs-config, none, $pbsdir:$pbsdir/bin:$pbsdir/../bin:$PATH)
+if test "$PBSCONFIG" != "none"; then
+  pbs_library_dir="`$PBSCONFIG --libs`"
+  pbs_version="`$PBSCONFIG --version`"
+else
+  pbs_library_DIR=""
+  pbs_version=""
+fi
+AC_SUBST(pbs_library_dir)
+AC_SUBST(pbs_version)
 
-  [pbspath=""]
-  [pbspath=`pbs-config --libs`]
-)dnl
 
 AM_PATH_PYTHON

trunk/setup.py.in

@@ -13 +13 @@
 # Try some usefule defaults if not set
 #
-PBS_LIB_DIR='@pbspath@'
+PBS_LIB_DIR='@pbs_library_dir@'
 NEW_BUILD_SYSTEM=1
 
@@ -48 +48 @@
 ### Make symlinks to right torque version
 #
+VERSION = "@pbs_version@"
+tmp = VERSION.split('.')
+major_version = '.'.join( tmp[0:2] )
+
+
+
+os.chdir('src')
+
+## Always unlink previous links
+#
+try:
+        os.unlink('pbs.py')
+        os.unlink('pbs_wrap.c')
+except OSError:
+        pass
+
+if major_version in [ '2.3', '2.4']:
+        os.symlink('pbs_wrap_2.4.c', 'pbs_wrap.c')
+        os.symlink('pbs_2.4.py', 'pbs.py')
+else:
+        os.symlink('pbs_wrap_2.1.c', 'pbs_wrap.c')
+        os.symlink('pbs_2.1.py', 'pbs.py')
+os.chdir('..')
 
 setup ( name = 'pbs_python',