[cig-commits] r5933 - cs/autoconf/trunk
leif at geodynamics.org
leif at geodynamics.org
Tue Jan 30 12:54:54 PST 2007
Author: leif
Date: 2007-01-30 12:54:53 -0800 (Tue, 30 Jan 2007)
New Revision: 5933
Added:
cs/autoconf/trunk/cit_python.m4
Removed:
cs/autoconf/trunk/cit_fc_main.m4
cs/autoconf/trunk/cit_path_exchanger.m4
cs/autoconf/trunk/cit_path_pythia.m4
cs/autoconf/trunk/cit_prog_pyconfig.m4
cs/autoconf/trunk/cit_python_eggs.m4
cs/autoconf/trunk/cit_python_incdir.m4
cs/autoconf/trunk/cit_python_site.m4
cs/autoconf/trunk/cit_python_sysconfig.m4
Modified:
cs/autoconf/trunk/cit_fortran.m4
Log:
Deleted old, dusty, unused Autoconf macros. Consolidated Python
macros into 'cit_python.m4'; merged the loner 'cit_fc_main.m4' into
'cit_fortran.m4'.
Deleted: cs/autoconf/trunk/cit_fc_main.m4
===================================================================
--- cs/autoconf/trunk/cit_fc_main.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_fc_main.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,68 +0,0 @@
-# _CIT_FC_MAIN
-# ------------
-# Define {F77,FC}_MAIN to the name of the alternate main() function
-# for use with the Fortran libraries (i.e., MAIN__ or whatever), or
-# 'main' if no such alternate name is found.
-#
-# As of Autoconf 2.59, the macro AC_FC_MAIN does not work with ifort
-# v9, because the macro assumes that 'main' will be resolved by
-# FCLIBS, but FCLIBS does not include Intel's 'for_main.o'. This
-# macro simply links with the Fortran compiler instead.
-#
-AC_DEFUN([_CIT_FC_MAIN],
-[_AC_FORTRAN_ASSERT()dnl
-AC_CACHE_CHECK([for alternate main to link with Fortran libraries],
- ac_cv_[]_AC_LANG_ABBREV[]_main,
-[ac_[]_AC_LANG_ABBREV[]_m_save_LIBS=$LIBS
- LIBS="cfortran_test.$ac_objext $LIBS"
- ac_fortran_dm_var=[]_AC_FC[]_DUMMY_MAIN
- ac_cv_fortran_main="main" # default entry point name
- for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do
- AC_LANG_PUSH(C)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@ifdef FC_DUMMY_MAIN_EQ_F77
-@%:@ undef F77_DUMMY_MAIN
-@%:@ undef FC_DUMMY_MAIN
-@%:@else
-@%:@ undef $ac_fortran_dm_var
-@%:@endif
-@%:@define main $ac_func])],
- [mv conftest.$ac_objext cfortran_test.$ac_objext],
- [AC_MSG_FAILURE([cannot compile a simple C program])])
- AC_LANG_POP(C)
- AC_LINK_IFELSE([AC_LANG_SOURCE(
-[ subroutine foobar()
- return
- end])], [ac_cv_fortran_main=$ac_func; break])
- rm -f cfortran_test* conftest*
- done
- ac_cv_[]_AC_LANG_ABBREV[]_main=$ac_cv_fortran_main
- rm -f cfortran_test* conftest*
- LIBS=$ac_[]_AC_LANG_ABBREV[]_m_save_LIBS
-])
-AC_DEFINE_UNQUOTED([]_AC_FC[]_MAIN, $ac_cv_[]_AC_LANG_ABBREV[]_main,
- [Define to alternate name for `main' routine that is
- called from a `main' in the Fortran libraries.])
-])# _CIT_FC_MAIN
-
-
-# CIT_F77_MAIN
-# ------------
-AC_DEFUN([CIT_F77_MAIN],
-[AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])dnl
-AC_LANG_PUSH(Fortran 77)dnl
-_AC_FC_MAIN
-AC_LANG_POP(Fortran 77)dnl
-])# CIT_F77_MAIN
-
-
-# CIT_FC_MAIN
-# -----------
-AC_DEFUN([CIT_FC_MAIN],
-[AC_REQUIRE([AC_FC_LIBRARY_LDFLAGS])dnl
-AC_LANG_PUSH(Fortran)dnl
-_CIT_FC_MAIN
-AC_LANG_POP(Fortran)dnl
-])# CIT_FC_MAIN
-
-
-dnl end of file
Modified: cs/autoconf/trunk/cit_fortran.m4
===================================================================
--- cs/autoconf/trunk/cit_fortran.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_fortran.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -6,6 +6,73 @@
## ---------------------------- ##
+# _CIT_FC_MAIN
+# ------------
+# Define {F77,FC}_MAIN to the name of the alternate main() function
+# for use with the Fortran libraries (i.e., MAIN__ or whatever), or
+# 'main' if no such alternate name is found.
+#
+# As of Autoconf 2.59, the macro AC_FC_MAIN does not work with ifort
+# v9, because the macro assumes that 'main' will be resolved by
+# FCLIBS, but FCLIBS does not include Intel's 'for_main.o'. This
+# macro simply links with the Fortran compiler instead.
+#
+AC_DEFUN([_CIT_FC_MAIN],
+[_AC_FORTRAN_ASSERT()dnl
+AC_CACHE_CHECK([for alternate main to link with Fortran libraries],
+ ac_cv_[]_AC_LANG_ABBREV[]_main,
+[ac_[]_AC_LANG_ABBREV[]_m_save_LIBS=$LIBS
+ LIBS="cfortran_test.$ac_objext $LIBS"
+ ac_fortran_dm_var=[]_AC_FC[]_DUMMY_MAIN
+ ac_cv_fortran_main="main" # default entry point name
+ for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do
+ AC_LANG_PUSH(C)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@ifdef FC_DUMMY_MAIN_EQ_F77
+@%:@ undef F77_DUMMY_MAIN
+@%:@ undef FC_DUMMY_MAIN
+@%:@else
+@%:@ undef $ac_fortran_dm_var
+@%:@endif
+@%:@define main $ac_func])],
+ [mv conftest.$ac_objext cfortran_test.$ac_objext],
+ [AC_MSG_FAILURE([cannot compile a simple C program])])
+ AC_LANG_POP(C)
+ AC_LINK_IFELSE([AC_LANG_SOURCE(
+[ subroutine foobar()
+ return
+ end])], [ac_cv_fortran_main=$ac_func; break])
+ rm -f cfortran_test* conftest*
+ done
+ ac_cv_[]_AC_LANG_ABBREV[]_main=$ac_cv_fortran_main
+ rm -f cfortran_test* conftest*
+ LIBS=$ac_[]_AC_LANG_ABBREV[]_m_save_LIBS
+])
+AC_DEFINE_UNQUOTED([]_AC_FC[]_MAIN, $ac_cv_[]_AC_LANG_ABBREV[]_main,
+ [Define to alternate name for `main' routine that is
+ called from a `main' in the Fortran libraries.])
+])# _CIT_FC_MAIN
+
+
+# CIT_F77_MAIN
+# ------------
+AC_DEFUN([CIT_F77_MAIN],
+[AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])dnl
+AC_LANG_PUSH(Fortran 77)dnl
+_AC_FC_MAIN
+AC_LANG_POP(Fortran 77)dnl
+])# CIT_F77_MAIN
+
+
+# CIT_FC_MAIN
+# -----------
+AC_DEFUN([CIT_FC_MAIN],
+[AC_REQUIRE([AC_FC_LIBRARY_LDFLAGS])dnl
+AC_LANG_PUSH(Fortran)dnl
+_CIT_FC_MAIN
+AC_LANG_POP(Fortran)dnl
+])# CIT_FC_MAIN
+
+
# CIT_FC_OPEN_APPEND
# ------------------
AC_DEFUN([CIT_FC_OPEN_APPEND], [
Deleted: cs/autoconf/trunk/cit_path_exchanger.m4
===================================================================
--- cs/autoconf/trunk/cit_path_exchanger.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_path_exchanger.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,109 +0,0 @@
-# CIT_PATH_EXCHANGER([VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -----------------------------------------------------------------------
-# Check for the Exchanger package.
-AC_DEFUN([CIT_PATH_EXCHANGER], [
-# $Id$
-AC_REQUIRE([AM_PATH_PYTHON])
-# undocumented configure arg --with-exchanger=[auto|prepackaged|VERSION]
-if test "${with_exchanger+set}" = set; then
- case "$with_exchanger" in
- yes | no) want_exchanger="auto" ;;
- auto | prepackaged | *.*) want_exchanger="$with_exchanger" ;;
- * ) want_exchanger="auto" ;;
- esac
-else
- want_exchanger="auto"
-fi
-AC_MSG_CHECKING([for Exchanger with version ~ $1])
-if test "$want_exchanger" = "prepackaged"; then
- if test -d $srcdir/Exchanger; then
- AC_MSG_RESULT([(prepackaged) yes])
- MAYBE_EXCHANGER=Exchanger
- # Override these tests in any subpackages.
- ac_configure_args="$ac_configure_args --with-exchanger=$1"
- exchanger_builddir=`pwd`/Exchanger
- CPPFLAGS="-I$exchanger_builddir/include $CPPFLAGS"; export CPPFLAGS
- LDFLAGS="-L$exchanger_builddir $LDFLAGS"; export LDFLAGS
- $2
- else
- AC_MSG_RESULT(no)
- m4_default([$3], [AC_MSG_ERROR([prepackaged Exchanger not found])])
- fi
-elif test "$want_exchanger" != "auto"; then
- # Override the tests.
- exchanger_version=$want_exchanger
- if test "$exchanger_version" = $1; then
- AC_MSG_RESULT([(prepackaged) yes])
- $2
- else
- AC_MSG_RESULT([(prepackaged) no])
- m4_default([$3], [AC_MSG_ERROR([prepackaged Exchanger v$exchanger_version is unsuitable; need v$1])])
- fi
-else
- test -d empty || mkdir empty
- exchanger_version=`cd empty && $PYTHON -c "import Exchanger; print Exchanger.__version__" 2>/dev/null`
- rmdir empty
- [eval `echo $exchanger_version | sed 's/\([^.]*\)[.]\([^.]*\).*/exchanger_version_major=\1; exchanger_version_minor=\2;/'`]
- [eval `echo $1 | sed 's/\([^.]*\)[.]\([^.]*\).*/exchanger_1_major=\1; exchanger_1_minor=\2;/'`]
- if test -n "$exchanger_version_major" &&
- test -n "$exchanger_version_minor" &&
- test "$exchanger_version_major" -eq "$exchanger_1_major" &&
- test "$exchanger_version_minor" -ge "$exchanger_1_minor"; then
- AC_MSG_RESULT([yes ($exchanger_version)])
- AC_MSG_CHECKING([Exchanger include directory])
- test -d empty || mkdir empty
- [exchanger_includedir=`cd empty && $PYTHON -c "from Exchanger.config import makefile; print makefile['includedir']" 2>/dev/null`]
- rmdir empty
- if test -d "$exchanger_includedir"; then
- AC_MSG_RESULT([$exchanger_includedir])
- CPPFLAGS="-I$exchanger_includedir $CPPFLAGS"; export CPPFLAGS
- else
- AC_MSG_RESULT(no)
- fi
- AC_MSG_CHECKING([Exchanger lib directory])
- test -d empty || mkdir empty
- [exchanger_libdir=`cd empty && $PYTHON -c "from Exchanger.config import makefile; print makefile['libdir']" 2>/dev/null`]
- rmdir empty
- if test -d "$exchanger_libdir"; then
- AC_MSG_RESULT([$exchanger_libdir])
- LDFLAGS="-L$exchanger_libdir $LDFLAGS"; export LDFLAGS
- else
- AC_MSG_RESULT(no)
- fi
-dnl Painful to test; requires MPI.
-dnl AC_CHECK_LIB(Exchanger, PyExchanger_exchangeBoundedBox, [],
-dnl [AC_MSG_ERROR([Exchanger libraries not found; try LDFLAGS="-L<Exchanger lib dir>"])]
- AC_LANG_PUSH(C++)
- AC_CHECK_HEADER([Exchanger/DIM.h], [
- $2
- :
- ], [
- m4_default([$3], [AC_MSG_ERROR([Exchanger headers not found; try CPPFLAGS="-I<parent of 'Exchanger' include dir>"])])
- :
- ])
- AC_LANG_POP(C++)
- else
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING([for prepackaged Exchanger])
- if test -d $srcdir/Exchanger; then
- AC_MSG_RESULT(yes)
- MAYBE_EXCHANGER=Exchanger
- # Override the above tests in any subpackages.
- ac_configure_args="$ac_configure_args --with-exchanger=$1"
- exchanger_builddir=`pwd`/Exchanger
- CPPFLAGS="-I$exchanger_builddir/include $CPPFLAGS"; export CPPFLAGS
- LDFLAGS="-L$exchanger_builddir $LDFLAGS"; export LDFLAGS
- $2
- else
- AC_MSG_RESULT(no)
- m4_default([$3], [AC_MSG_ERROR([no suitable Exchanger package found; check PYTHONPATH])])
- fi
- fi
-fi
-if test -d $srcdir/Exchanger; then
- MAYBE_DIST_EXCHANGER=Exchanger
-fi
-AC_SUBST([MAYBE_EXCHANGER])
-AC_SUBST([MAYBE_DIST_EXCHANGER])
-])dnl CIT_PATH_EXCHANGER
-dnl end of file
Deleted: cs/autoconf/trunk/cit_path_pythia.m4
===================================================================
--- cs/autoconf/trunk/cit_path_pythia.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_path_pythia.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,208 +0,0 @@
-# CIT_PATH_PYTHIA([VERSION], [SUBPACKAGES],
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ---------------------------------------------------------
-# Check for the Pythia package. If SUBPACKAGES is
-# specified, check for each whitespace-separated subpackage
-# listed (useful for optional subpackages such as 'mpi'
-# and 'acis').
-AC_DEFUN([CIT_PATH_PYTHIA], [
-# $Id$
-AC_REQUIRE([AM_PATH_PYTHON])
-# undocumented configure arg --with-pythia=[auto|prepackaged|VERSION|VERSION-SUBPACKAGES]
-if test "${with_pythia+set}" = set; then
- case "$with_pythia" in
- yes | no) want_pythia="auto" ;;
- auto | prepackaged | *.*) want_pythia="$with_pythia" ;;
- * ) want_pythia="auto" ;;
- esac
-else
- want_pythia="auto"
-fi
-pythia_mpi="no"
-for pythia_subpackage in : $2; do
- test "x$pythia_subpackage" = x: && continue
- if test "$pythia_subpackage" = "mpi"; then
- pythia_mpi="yes"
- fi
-done
-AC_MSG_CHECKING([for Pythia v$1])
-if test "$want_pythia" = "prepackaged"; then
- if test -d $srcdir/pythia-$1; then
- AC_MSG_RESULT([(prepackaged) yes])
- MAYBE_PYTHIA=pythia-$1
- # Override these tests in any subpackages.
- if test -n "$2"; then
- pythia_version=$1-`echo $2 | sed 's/ /-/g'`
- else
- pythia_version="$1"
- fi
- ac_configure_args="$ac_configure_args --with-pythia=$pythia_version"
- # Find Pythia headers and libraries in the build directory.
- pythia_builddir=`pwd`/pythia-$1
- pythia_pkgdir=$pythia_builddir/packages
- CPPFLAGS="-I$pythia_builddir/include $CPPFLAGS"; export CPPFLAGS
- LDFLAGS="-L$pythia_pkgdir/journal/libjournal -L$pythia_pkgdir/mpi $LDFLAGS"; export LDFLAGS
- if test "$pythia_mpi" = "yes"; then
- AC_SUBST([PYTHIA_MPIPYTHON], ["\${bindir}/mpipython.exe"])
- fi
- $3
- else
- AC_MSG_RESULT(no)
- m4_default([$4], [AC_MSG_ERROR([prepackaged Pythia not found])])
- :
- fi
-elif test "$want_pythia" != "auto"; then
- # Override the tests.
- pythia_version=`echo $want_pythia | sed 's/-/ /' | sed 's/ .*//'`
- pythia_subpackages=,`echo $want_pythia | sed 's/-/ /' | sed 's/^.* //' | sed 's/-/,/g'`,
- if test "$pythia_version" = $1; then
- AC_MSG_RESULT([(prepackaged) yes])
- pythia_found="yes"
- for pythia_subpackage in : $2; do
- test "x$pythia_subpackage" = x: && continue
- AC_MSG_CHECKING([for subpackage '$pythia_subpackage' in Pythia])
- if test `echo $pythia_subpackages | grep ,$pythia_subpackage,`; then
- AC_MSG_RESULT([(prepackaged) yes])
- else
- AC_MSG_RESULT([(prepackaged) no])
- pythia_found="no"
- fi
- done
- if test "$pythia_found" = "yes"; then
- if test "$pythia_mpi" = "yes"; then
- AC_SUBST([PYTHIA_MPIPYTHON], ["\${bindir}/mpipython.exe"])
- fi
- $3
- else
- m4_default([$4], [AC_MSG_ERROR([prepackaged Pythia is unsuitable; need subpackages: $2])])
- :
- fi
- else
- AC_MSG_RESULT([(prepackaged) no])
- m4_default([$4], [AC_MSG_ERROR([prepackaged Pythia v$pythia_version is unsuitable; need v$1])])
- fi
-else
- # It is common practice to create a 'pyre' project subdirectory, which
- # Python will search instead of the installed Pyre!
- test -d empty || mkdir empty
- pythia_version=`cd empty && $PYTHON -c "import pyre; print pyre.__version__" 2>/dev/null`
- rmdir empty
- if test "$pythia_version" = $1; then
- AC_MSG_RESULT(yes)
- pythia_found="yes"
- for pythia_subpackage in : $2; do
- test "x$pythia_subpackage" = x: && continue
- AC_MSG_CHECKING([for subpackage '$pythia_subpackage' in Pythia])
- test -d empty || mkdir empty
- pythia_subversion=`cd empty && $PYTHON -c "import $pythia_subpackage; print $pythia_subpackage.__version__" 2>/dev/null`
- rmdir empty
- if test "$pythia_subversion" = $1; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- pythia_found="no"
- fi
- done
- if test "$pythia_found" = "yes"; then
- AC_MSG_CHECKING([Pythia include directory])
- test -d empty || mkdir empty
- [pythia_pkgincludedir=`cd empty && $PYTHON -c "from pyre.config import makefile; print makefile['pkgincludedir']" 2>/dev/null`]
- rmdir empty
- if test -d "$pythia_pkgincludedir"; then
- AC_MSG_RESULT([$pythia_pkgincludedir])
- CPPFLAGS="-I$pythia_pkgincludedir $CPPFLAGS"; export CPPFLAGS
- else
- AC_MSG_RESULT(no)
- fi
- AC_MSG_CHECKING([Pythia lib directory])
- test -d empty || mkdir empty
- [pythia_libdir=`cd empty && $PYTHON -c "from pyre.config import makefile; print makefile['libdir']" 2>/dev/null`]
- rmdir empty
- if test -d "$pythia_libdir"; then
- AC_MSG_RESULT([$pythia_libdir])
- LDFLAGS="-L$pythia_libdir $LDFLAGS"; export LDFLAGS
- else
- AC_MSG_RESULT(no)
- fi
- AC_MSG_CHECKING([Pythia bin directory])
- test -d empty || mkdir empty
- [pythia_bindir=`cd empty && $PYTHON -c "from pyre.config import makefile; print makefile['bindir']" 2>/dev/null`]
- rmdir empty
- if test -d "$pythia_bindir"; then
- AC_MSG_RESULT([$pythia_bindir])
- else
- AC_MSG_RESULT(no)
- fi
- AC_CHECK_LIB(journal, firewall_hit, [
- AC_LANG_PUSH(C++)
- AC_CHECK_HEADER([journal/diagnostics.h], [
- if test "$pythia_mpi" = "no"; then
- :
- elif test -n "$pythia_bindir"; then
- AC_MSG_CHECKING([for mpipython.exe])
- if test -x "$pythia_bindir/mpipython.exe"; then
- AC_SUBST([PYTHIA_MPIPYTHON], ["$pythia_bindir/mpipython.exe"])
- AC_MSG_RESULT([$PYTHIA_MPIPYTHON])
- $3
- else
- AC_MSG_RESULT(no)
- m4_default([$4], [AC_MSG_ERROR([Pythia program 'mpipython.exe' not found])])
- fi
- else
- AC_PATH_PROG([PYTHIA_MPIPYTHON], [mpipython.exe], [no])
- if test "$PYTHIA_MPIPYTHON" != "no"; then
- $3
- :
- else
- m4_default([$4], [AC_MSG_ERROR([Pythia program 'mpipython.exe' not found])])
- :
- fi
- fi
- ], [
- m4_default([$4], [AC_MSG_ERROR([Pythia headers not found; try CPPFLAGS="-I<pythia-$1 include dir>"])])
- :
- ])
- AC_LANG_POP(C++)
- ], [
- m4_default([$4], [AC_MSG_ERROR([Pythia libraries not found; try LDFLAGS="-L<Pythia lib dir>"])])
- :
- ])
- else
- m4_default([$4], [AC_MSG_ERROR([required Pythia subpackages not found: $2])])
- :
- fi
- else
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING([for prepackaged Pythia])
- if test -d $srcdir/pythia-$1; then
- AC_MSG_RESULT(yes)
- MAYBE_PYTHIA=pythia-$1
- # Override the above tests in any subpackages.
- if test -n "$2"; then
- pythia_version=$1-`echo $2 | sed 's/ /-/g'`
- else
- pythia_version="$1"
- fi
- ac_configure_args="$ac_configure_args --with-pythia=$pythia_version"
- # Find Pythia headers and libraries in the build directory.
- pythia_builddir=`pwd`/pythia-$1
- pythia_pkgdir=$pythia_builddir/packages
- CPPFLAGS="-I$pythia_builddir/include $CPPFLAGS"; export CPPFLAGS
- LDFLAGS="-L$pythia_pkgdir/journal/libjournal -L$pythia_pkgdir/mpi $LDFLAGS"; export LDFLAGS
- if test "$pythia_mpi" = "yes"; then
- AC_SUBST([PYTHIA_MPIPYTHON], ["\${bindir}/mpipython.exe"])
- fi
- $3
- else
- AC_MSG_RESULT(no)
- m4_default([$4], [AC_MSG_ERROR([no suitable Pythia package found; check PYTHONPATH])])
- fi
- fi
-fi
-if test -d $srcdir/pythia-$1; then
- MAYBE_DIST_PYTHIA=pythia-$1
-fi
-AC_SUBST([MAYBE_PYTHIA])
-AC_SUBST([MAYBE_DIST_PYTHIA])
-])dnl CIT_PATH_PYTHIA
-dnl end of file
Deleted: cs/autoconf/trunk/cit_prog_pyconfig.m4
===================================================================
--- cs/autoconf/trunk/cit_prog_pyconfig.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_prog_pyconfig.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,72 +0,0 @@
-# CIT_PROG_PYCONFIG
-# -----------------
-# Provide a simple Python script which generates a Python module to
-# expose our package configuration, similar to Python's
-# distutils.sysconfig.
-AC_DEFUN([CIT_PROG_PYCONFIG], [
-# $Id: cit_prog_mpicxx.m4,v 1.1 2005/09/09 16:12:01 leif Exp $
-PYCONFIG='$(top_builddir)/pyconfig'
-AC_SUBST(PYCONFIG)
-ofile=pyconfig
-cfgfile="${ofile}T"
-trap "rm \"$cfgfile\"; exit 1" 1 2 15
-rm -f "$cfgfile"
-AC_MSG_NOTICE([creating $ofile])
-cat >"$cfgfile" <<END_OF_PYTHON
-[#!/usr/bin/env python
-
-from getopt import getopt, GetoptError
-from sys import argv, exit
-from getopt import getopt
-from distutils.sysconfig import parse_config_h, parse_makefile, expand_makefile_vars
-
-def printUsage():
- print "Usage: %s -h HEADER -m MAKEFILE -o OUTPUT" % argv[0]
-
-try:
- (opts, args) = getopt(argv[1:], "h:m:o:")
-except GetoptError, error:
- print "%s: %s" % (argv[0], error)
- printUsage()
- exit(1)
-
-header = '';
-makefile = '';
-output = '';
-for option, parameter in opts:
- if option == '-h':
- header = parameter
- elif option == '-m':
- makefile = parameter
- elif option == '-o':
- output = parameter
-if not (header and makefile and output):
- printUsage()
- exit(1)
-
-f = open(header)
-config_vars = parse_config_h(f)
-f.close()
-
-makefile_vars = parse_makefile(makefile)
-keys = makefile_vars.keys()
-for key in keys:
- makefile_vars[key] = expand_makefile_vars(makefile_vars[key], makefile_vars)
-
-f = open(output, 'w')
-print >>f, "#!/usr/bin/env python"
-print >>f
-print >>f, "config =", config_vars
-print >>f
-print >>f, "makefile =", makefile_vars
-print >>f
-print >>f, "# end of file"
-f.close()
-
-# end of file]
-END_OF_PYTHON
-mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-chmod +x "$ofile"
-])dnl CIT_PROG_PYCONFIG
-dnl end of file
Added: cs/autoconf/trunk/cit_python.m4
===================================================================
--- cs/autoconf/trunk/cit_python.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_python.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -0,0 +1,345 @@
+# -*- Autoconf -*-
+
+
+## --------------------------- ##
+## Autoconf macros for Python. ##
+## --------------------------- ##
+
+
+# CIT_PYTHON_INCDIR
+# -----------------
+# Determine the directory containing <Python.h> using distutils.
+AC_DEFUN([CIT_PYTHON_INCDIR], [
+# $Id: cit_python_incdir.m4 2367 2005-09-09 16:46:52Z leif $
+AC_REQUIRE([AM_PATH_PYTHON])
+AC_CACHE_CHECK([for $am_display_PYTHON include directory],
+ [PYTHON_INCDIR],
+ [PYTHON_INCDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/include/python$PYTHON_VERSION"`])
+AC_SUBST([PYTHON_INCDIR], [$PYTHON_INCDIR])
+])dnl CIT_PYTHON_INCDIR
+
+
+# CIT_PYTHON_SYSCONFIG
+# --------------------
+AC_DEFUN([CIT_PYTHON_SYSCONFIG], [
+# $Id: cit_python_sysconfig.m4 5301 2006-11-16 12:59:42Z leif $
+AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING([$am_display_PYTHON sysconfig])
+cat >sysconfig.py <<END_OF_PYTHON
+[from distutils import sysconfig
+print 'PYTHON_INCDIR="%s"' % sysconfig.get_python_inc()
+keys = (
+ 'BLDLIBRARY',
+ 'LDFLAGS',
+ 'LDLAST',
+ 'LDLIBRARY',
+ 'LIBDIR',
+ 'LIBP',
+ 'LIBPL',
+ 'LIBS',
+ 'LINKFORSHARED',
+ 'MODLIBS',
+ 'SYSLIBS',
+)
+vars = sysconfig.get_config_vars()
+# transform AIX's python.exp
+vars['LINKFORSHARED'] = vars['LINKFORSHARED'].replace('Modules',vars['LIBPL'])
+if vars['LDLIBRARY'] == vars['LIBRARY']:
+ # "On systems without shared libraries, LDLIBRARY is the same as LIBRARY"
+ vars['BLDLIBRARY'] = "-L%(LIBPL)s -lpython%(VERSION)s" % vars
+elif vars['BLDLIBRARY']:
+ vars['BLDLIBRARY'] = "-L%(LIBDIR)s -lpython%(VERSION)s" % vars
+else:
+ # "On Mac OS X frameworks, BLDLIBRARY is blank"
+ # See also Issue39.
+ framework = "%(PYTHONFRAMEWORKDIR)s/Versions/%(VERSION)s/%(PYTHONFRAMEWORK)s" % vars
+ vars['LINKFORSHARED'] = vars['LINKFORSHARED'].replace(framework, "-framework " + vars.get('PYTHONFRAMEWORK', 'Python'))
+for key in keys:
+ print 'PYTHON_%s="%s"' % (key, vars.get(key, ''))
+]
+END_OF_PYTHON
+eval `$PYTHON sysconfig.py 2>/dev/null`
+if test -n "$PYTHON_INCDIR"; then
+ AC_MSG_RESULT(ok)
+else
+ AC_MSG_ERROR(["failed
+
+Run '$PYTHON sysconfig.py' to see what wrong.
+"])
+fi
+rm -f sysconfig.py
+AC_SUBST([PYTHON_INCDIR], [$PYTHON_INCDIR])
+AC_SUBST([PYTHON_BLDLIBRARY], [$PYTHON_BLDLIBRARY])
+AC_SUBST([PYTHON_LDFLAGS], [$PYTHON_LDFLAGS])
+AC_SUBST([PYTHON_LDLAST], [$PYTHON_LDLAST])
+AC_SUBST([PYTHON_LDLIBRARY], [$PYTHON_LDLIBRARY])
+AC_SUBST([PYTHON_LIBDIR], [$PYTHON_LIBDIR])
+AC_SUBST([PYTHON_LIBP], [$PYTHON_LIBP])
+AC_SUBST([PYTHON_LIBPL], [$PYTHON_LIBPL])
+AC_SUBST([PYTHON_LIBS], [$PYTHON_LIBS])
+AC_SUBST([PYTHON_LINKFORSHARED], [$PYTHON_LINKFORSHARED])
+AC_SUBST([PYTHON_MODLIBS], [$PYTHON_MODLIBS])
+AC_SUBST([PYTHON_SYSLIBS], [$PYTHON_SYSLIBS])
+])dnl CIT_PYTHON_SYSCONFIG
+
+
+# CIT_PYTHON_SITE
+# ---------------
+AC_DEFUN([CIT_PYTHON_SITE], [
+# $Id: cit_python_site.m4 2659 2006-04-01 01:41:01Z leif $
+AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING([whether we are installing to Python's prefix])
+cit_python_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+if test "$cit_python_prefix" = "$prefix"; then
+ AC_MSG_RESULT(yes)
+ cit_cond_python_site=true
+else
+ AC_MSG_RESULT(no)
+ cit_cond_python_site=false
+fi
+AC_MSG_CHECKING([whether we are installing to Python's exec prefix])
+cit_python_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+cit_exec_prefix=$exec_prefix
+test "x$cit_exec_prefix" = xNONE && cit_exec_prefix=$prefix
+if test "$cit_python_exec_prefix" = "$cit_exec_prefix"; then
+ AC_MSG_RESULT(yes)
+ cit_cond_pyexec_site=true
+else
+ AC_MSG_RESULT(no)
+ cit_cond_pyexec_site=false
+fi
+AM_CONDITIONAL([COND_PYTHON_SITE], [$cit_cond_python_site])
+AM_CONDITIONAL([COND_PYEXEC_SITE], [$cit_cond_pyexec_site])
+])dnl CIT_PYTHON_SITE
+
+
+# CIT_CHECK_PYTHON_EGG(REQUIREMENT,
+# [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]])
+# --------------------------------------------------------------
+
+# Check for REQUIREMENT using pkg_resources.require(). If the
+# corresponding distribution is found, append it to the list of
+# requirements and execute ACTION-IF-FOUND. Otherwise, execute
+# ACTION-IF-NOT-FOUND.
+
+AC_DEFUN([CIT_CHECK_PYTHON_EGG], [
+# $Id: cit_python_eggs.m4 4616 2006-09-25 23:41:07Z leif $
+
+AC_MSG_CHECKING([for "$1"])
+
+cat >check_python_egg.py <<END_OF_PYTHON
+[
+import sys
+try:
+ from pkg_resources import require
+ require("$1")
+except Exception, e:
+ print >>sys.stderr, e
+ print "cit_egg_status=1"
+else:
+ print "cit_egg_status=0"
+]
+END_OF_PYTHON
+
+AS_IF([AC_TRY_COMMAND([$PYTHON check_python_egg.py >conftest.sh 2>&AS_MESSAGE_LOG_FD])],
+ [],
+ [AC_MSG_RESULT(failed)
+ AC_MSG_FAILURE([cannot check for Python eggs])])
+eval `cat conftest.sh`
+rm -f conftest.sh check_python_egg.py
+
+if test "$cit_egg_status" == 0; then
+ AC_MSG_RESULT(yes)
+ cit_egg_requirements="$1:$cit_egg_requirements"
+ $2
+else
+ AC_MSG_RESULT(no)
+ m4_default([$3], [AC_MSG_ERROR([required Python package not found; try running "$PYTHON setup.py"])])
+fi
+
+])dnl CIT_CHECK_PYTHON_EGG
+
+
+# CIT_PYTHON_EGG_FLAGS
+# --------------------
+
+# Perform a breadth-first traversal of Python dependencies (as
+# indicated by the requirements accumulated by CIT_CHECK_PYTHON_EGG).
+# Set PYTHON_EGG_CFLAGS, PYTHON_EGG_CPPFLAGS, and PYTHON_EGG_LDFLAGS
+# according to each dependency's "config.cfg" metadata, if present.
+
+# Loosely inspired by PKG_CHECK_MODULES. See pkg-config(1).
+
+AC_DEFUN([CIT_PYTHON_EGG_FLAGS], [
+# $Id: cit_python_eggs.m4 4616 2006-09-25 23:41:07Z leif $
+
+AC_MSG_CHECKING([for egg-related flags])
+
+cat >check_python_egg.py <<END_OF_PYTHON
+[
+try:
+ from pkg_resources import require
+except Exception, e:
+ print >>sys.stderr, e
+ sys.exit(0)
+
+import sys
+from ConfigParser import ConfigParser, NoOptionError
+from StringIO import StringIO
+
+flags = dict(
+ CFLAGS = [],
+ CPPFLAGS = [],
+ LDFLAGS = [],
+)
+
+cit_egg_requirements = "$cit_egg_requirements"
+requirements = cit_egg_requirements.split(':')
+
+deps = require(*requirements)
+deps.reverse()
+dependencies = []
+processed = {}
+for dist in deps:
+ if dist in processed:
+ continue
+ dependencies.insert(0, dist)
+ processed[dist] = True
+for dist in dependencies:
+ if dist.has_metadata('config.cfg'):
+ parser = ConfigParser({'location': dist.location})
+ config = dist.get_metadata('config.cfg')
+ fp = StringIO(config)
+ parser.readfp(fp, 'config.cfg')
+ for k,v in flags.iteritems():
+ try:
+ v.append(parser.get('flags', k))
+ except NoOptionError:
+ pass
+
+for k,v in flags.iteritems():
+ print 'PYTHON_EGG_%s="%s"' % (k, ' '.join(v))
+]
+END_OF_PYTHON
+
+AS_IF([AC_TRY_COMMAND([$PYTHON check_python_egg.py >conftest.sh 2>&AS_MESSAGE_LOG_FD])],
+ [AC_MSG_RESULT(ok)],
+ [AC_MSG_RESULT(failed)
+ AC_MSG_FAILURE([cannot scan Python eggs for flags])])
+eval `cat conftest.sh`
+rm -f conftest.sh check_python_egg.py
+
+AC_SUBST(PYTHON_EGG_CFLAGS)
+AC_SUBST(PYTHON_EGG_CPPFLAGS)
+AC_SUBST(PYTHON_EGG_LDFLAGS)
+
+])dnl CIT_PYTHON_EGG_FLAGS
+
+
+# CIT_PYTHON_EGG_REQUIRES
+# -----------------------
+
+# Dump Python egg requirements (accumulated by CIT_CHECK_PYTHON_EGG)
+# to 'requires.txt'.
+
+AC_DEFUN([CIT_PYTHON_EGG_REQUIRES], [
+# $Id: cit_python_eggs.m4 4616 2006-09-25 23:41:07Z leif $
+
+ofile=requires.txt
+requiresfile="${ofile}T"
+trap "rm \"$requiresfile\"; exit 1" 1 2 15
+rm -f "$requiresfile"
+
+AC_MSG_NOTICE([creating $ofile])
+
+cit_save_IFS=$IFS; IFS=:
+for cit_egg_requirement in $cit_egg_requirements
+do
+ IFS=$cit_save_IFS
+ echo $cit_egg_requirement >>$requiresfile
+done
+
+mv -f "$requiresfile" "$ofile" || \
+ (rm -f "$ofile" && cp "$requiresfile" "$ofile" && rm -f "$requiresfile")
+
+AC_SUBST([pythoneggdir], [\${pythondir}/$PACKAGE-$PACKAGE_VERSION.egg])
+AC_SUBST([pythonegginfodir], [\${pythoneggdir}/EGG-INFO])
+
+])dnl CIT_PYTHON_EGG_REQUIRES
+
+
+# CIT_PROG_PYCONFIG
+# -----------------
+# Provide a simple Python script which generates a Python module to
+# expose our package configuration, similar to Python's
+# distutils.sysconfig.
+AC_DEFUN([CIT_PROG_PYCONFIG], [
+# $Id: cit_prog_pyconfig.m4 2659 2006-04-01 01:41:01Z leif $
+PYCONFIG='$(top_builddir)/pyconfig'
+AC_SUBST(PYCONFIG)
+ofile=pyconfig
+cfgfile="${ofile}T"
+trap "rm \"$cfgfile\"; exit 1" 1 2 15
+rm -f "$cfgfile"
+AC_MSG_NOTICE([creating $ofile])
+cat >"$cfgfile" <<END_OF_PYTHON
+[#!/usr/bin/env python
+
+from getopt import getopt, GetoptError
+from sys import argv, exit
+from getopt import getopt
+from distutils.sysconfig import parse_config_h, parse_makefile, expand_makefile_vars
+
+def printUsage():
+ print "Usage: %s -h HEADER -m MAKEFILE -o OUTPUT" % argv[0]
+
+try:
+ (opts, args) = getopt(argv[1:], "h:m:o:")
+except GetoptError, error:
+ print "%s: %s" % (argv[0], error)
+ printUsage()
+ exit(1)
+
+header = '';
+makefile = '';
+output = '';
+for option, parameter in opts:
+ if option == '-h':
+ header = parameter
+ elif option == '-m':
+ makefile = parameter
+ elif option == '-o':
+ output = parameter
+if not (header and makefile and output):
+ printUsage()
+ exit(1)
+
+f = open(header)
+config_vars = parse_config_h(f)
+f.close()
+
+makefile_vars = parse_makefile(makefile)
+keys = makefile_vars.keys()
+for key in keys:
+ makefile_vars[key] = expand_makefile_vars(makefile_vars[key], makefile_vars)
+
+f = open(output, 'w')
+print >>f, "#!/usr/bin/env python"
+print >>f
+print >>f, "config =", config_vars
+print >>f
+print >>f, "makefile =", makefile_vars
+print >>f
+print >>f, "# end of file"
+f.close()
+
+# end of file]
+END_OF_PYTHON
+mv -f "$cfgfile" "$ofile" || \
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+chmod +x "$ofile"
+])dnl CIT_PROG_PYCONFIG
+
+
+dnl end of file
Deleted: cs/autoconf/trunk/cit_python_eggs.m4
===================================================================
--- cs/autoconf/trunk/cit_python_eggs.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_python_eggs.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,164 +0,0 @@
-# -*- Autoconf -*-
-
-
-## -------------------------------- ##
-## Autoconf macros for Python eggs. ##
-## -------------------------------- ##
-
-
-# CIT_CHECK_PYTHON_EGG(REQUIREMENT,
-# [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]])
-# --------------------------------------------------------------
-
-# Check for REQUIREMENT using pkg_resources.require(). If the
-# corresponding distribution is found, append it to the list of
-# requirements and execute ACTION-IF-FOUND. Otherwise, execute
-# ACTION-IF-NOT-FOUND.
-
-AC_DEFUN([CIT_CHECK_PYTHON_EGG], [
-# $Id$
-
-AC_MSG_CHECKING([for "$1"])
-
-cat >check_python_egg.py <<END_OF_PYTHON
-[
-import sys
-try:
- from pkg_resources import require
- require("$1")
-except Exception, e:
- print >>sys.stderr, e
- print "cit_egg_status=1"
-else:
- print "cit_egg_status=0"
-]
-END_OF_PYTHON
-
-AS_IF([AC_TRY_COMMAND([$PYTHON check_python_egg.py >conftest.sh 2>&AS_MESSAGE_LOG_FD])],
- [],
- [AC_MSG_RESULT(failed)
- AC_MSG_FAILURE([cannot check for Python eggs])])
-eval `cat conftest.sh`
-rm -f conftest.sh check_python_egg.py
-
-if test "$cit_egg_status" == 0; then
- AC_MSG_RESULT(yes)
- cit_egg_requirements="$1:$cit_egg_requirements"
- $2
-else
- AC_MSG_RESULT(no)
- m4_default([$3], [AC_MSG_ERROR([required Python package not found; try running "$PYTHON setup.py"])])
-fi
-
-])dnl CIT_CHECK_PYTHON_EGG
-
-
-# CIT_PYTHON_EGG_FLAGS
-# --------------------
-
-# Perform a breadth-first traversal of Python dependencies (as
-# indicated by the requirements accumulated by CIT_CHECK_PYTHON_EGG).
-# Set PYTHON_EGG_CFLAGS, PYTHON_EGG_CPPFLAGS, and PYTHON_EGG_LDFLAGS
-# according to each dependency's "config.cfg" metadata, if present.
-
-# Loosely inspired by PKG_CHECK_MODULES. See pkg-config(1).
-
-AC_DEFUN([CIT_PYTHON_EGG_FLAGS], [
-# $Id$
-
-AC_MSG_CHECKING([for egg-related flags])
-
-cat >check_python_egg.py <<END_OF_PYTHON
-[
-try:
- from pkg_resources import require
-except Exception, e:
- print >>sys.stderr, e
- sys.exit(0)
-
-import sys
-from ConfigParser import ConfigParser, NoOptionError
-from StringIO import StringIO
-
-flags = dict(
- CFLAGS = [],
- CPPFLAGS = [],
- LDFLAGS = [],
-)
-
-cit_egg_requirements = "$cit_egg_requirements"
-requirements = cit_egg_requirements.split(':')
-
-deps = require(*requirements)
-deps.reverse()
-dependencies = []
-processed = {}
-for dist in deps:
- if dist in processed:
- continue
- dependencies.insert(0, dist)
- processed[dist] = True
-for dist in dependencies:
- if dist.has_metadata('config.cfg'):
- parser = ConfigParser({'location': dist.location})
- config = dist.get_metadata('config.cfg')
- fp = StringIO(config)
- parser.readfp(fp, 'config.cfg')
- for k,v in flags.iteritems():
- try:
- v.append(parser.get('flags', k))
- except NoOptionError:
- pass
-
-for k,v in flags.iteritems():
- print 'PYTHON_EGG_%s="%s"' % (k, ' '.join(v))
-]
-END_OF_PYTHON
-
-AS_IF([AC_TRY_COMMAND([$PYTHON check_python_egg.py >conftest.sh 2>&AS_MESSAGE_LOG_FD])],
- [AC_MSG_RESULT(ok)],
- [AC_MSG_RESULT(failed)
- AC_MSG_FAILURE([cannot scan Python eggs for flags])])
-eval `cat conftest.sh`
-rm -f conftest.sh check_python_egg.py
-
-AC_SUBST(PYTHON_EGG_CFLAGS)
-AC_SUBST(PYTHON_EGG_CPPFLAGS)
-AC_SUBST(PYTHON_EGG_LDFLAGS)
-
-])dnl CIT_PYTHON_EGG_FLAGS
-
-
-# CIT_PYTHON_EGG_REQUIRES
-# -----------------------
-
-# Dump Python egg requirements (accumulated by CIT_CHECK_PYTHON_EGG)
-# to 'requires.txt'.
-
-AC_DEFUN([CIT_PYTHON_EGG_REQUIRES], [
-# $Id$
-
-ofile=requires.txt
-requiresfile="${ofile}T"
-trap "rm \"$requiresfile\"; exit 1" 1 2 15
-rm -f "$requiresfile"
-
-AC_MSG_NOTICE([creating $ofile])
-
-cit_save_IFS=$IFS; IFS=:
-for cit_egg_requirement in $cit_egg_requirements
-do
- IFS=$cit_save_IFS
- echo $cit_egg_requirement >>$requiresfile
-done
-
-mv -f "$requiresfile" "$ofile" || \
- (rm -f "$ofile" && cp "$requiresfile" "$ofile" && rm -f "$requiresfile")
-
-AC_SUBST([pythoneggdir], [\${pythondir}/$PACKAGE-$PACKAGE_VERSION.egg])
-AC_SUBST([pythonegginfodir], [\${pythoneggdir}/EGG-INFO])
-
-])dnl CIT_PYTHON_EGG_REQUIRES
-
-
-dnl end of file
Deleted: cs/autoconf/trunk/cit_python_incdir.m4
===================================================================
--- cs/autoconf/trunk/cit_python_incdir.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_python_incdir.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,13 +0,0 @@
-# CIT_PYTHON_INCDIR
-# -----------------
-# Determine the directory containing <Python.h> using distutils.
-AC_DEFUN([CIT_PYTHON_INCDIR], [
-# $Id$
-AC_REQUIRE([AM_PATH_PYTHON])
-AC_CACHE_CHECK([for $am_display_PYTHON include directory],
- [PYTHON_INCDIR],
- [PYTHON_INCDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null ||
- echo "$PYTHON_PREFIX/include/python$PYTHON_VERSION"`])
-AC_SUBST([PYTHON_INCDIR], [$PYTHON_INCDIR])
-])dnl CIT_PYTHON_INCDIR
-dnl end of file
Deleted: cs/autoconf/trunk/cit_python_site.m4
===================================================================
--- cs/autoconf/trunk/cit_python_site.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_python_site.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,29 +0,0 @@
-# CIT_PYTHON_SITE
-# ---------------
-AC_DEFUN([CIT_PYTHON_SITE], [
-# $Id: cit_python_site.m4,v 1.1 2005/09/09 16:12:01 leif Exp $
-AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING([whether we are installing to Python's prefix])
-cit_python_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-if test "$cit_python_prefix" = "$prefix"; then
- AC_MSG_RESULT(yes)
- cit_cond_python_site=true
-else
- AC_MSG_RESULT(no)
- cit_cond_python_site=false
-fi
-AC_MSG_CHECKING([whether we are installing to Python's exec prefix])
-cit_python_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-cit_exec_prefix=$exec_prefix
-test "x$cit_exec_prefix" = xNONE && cit_exec_prefix=$prefix
-if test "$cit_python_exec_prefix" = "$cit_exec_prefix"; then
- AC_MSG_RESULT(yes)
- cit_cond_pyexec_site=true
-else
- AC_MSG_RESULT(no)
- cit_cond_pyexec_site=false
-fi
-AM_CONDITIONAL([COND_PYTHON_SITE], [$cit_cond_python_site])
-AM_CONDITIONAL([COND_PYEXEC_SITE], [$cit_cond_pyexec_site])
-])dnl CIT_PYTHON_SITE
-dnl end of file
Deleted: cs/autoconf/trunk/cit_python_sysconfig.m4
===================================================================
--- cs/autoconf/trunk/cit_python_sysconfig.m4 2007-01-30 20:50:35 UTC (rev 5932)
+++ cs/autoconf/trunk/cit_python_sysconfig.m4 2007-01-30 20:54:53 UTC (rev 5933)
@@ -1,63 +0,0 @@
-# CIT_PYTHON_SYSCONFIG
-# --------------------
-AC_DEFUN([CIT_PYTHON_SYSCONFIG], [
-# $Id$
-AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING([$am_display_PYTHON sysconfig])
-cat >sysconfig.py <<END_OF_PYTHON
-[from distutils import sysconfig
-print 'PYTHON_INCDIR="%s"' % sysconfig.get_python_inc()
-keys = (
- 'BLDLIBRARY',
- 'LDFLAGS',
- 'LDLAST',
- 'LDLIBRARY',
- 'LIBDIR',
- 'LIBP',
- 'LIBPL',
- 'LIBS',
- 'LINKFORSHARED',
- 'MODLIBS',
- 'SYSLIBS',
-)
-vars = sysconfig.get_config_vars()
-# transform AIX's python.exp
-vars['LINKFORSHARED'] = vars['LINKFORSHARED'].replace('Modules',vars['LIBPL'])
-if vars['LDLIBRARY'] == vars['LIBRARY']:
- # "On systems without shared libraries, LDLIBRARY is the same as LIBRARY"
- vars['BLDLIBRARY'] = "-L%(LIBPL)s -lpython%(VERSION)s" % vars
-elif vars['BLDLIBRARY']:
- vars['BLDLIBRARY'] = "-L%(LIBDIR)s -lpython%(VERSION)s" % vars
-else:
- # "On Mac OS X frameworks, BLDLIBRARY is blank"
- # See also Issue39.
- framework = "%(PYTHONFRAMEWORKDIR)s/Versions/%(VERSION)s/%(PYTHONFRAMEWORK)s" % vars
- vars['LINKFORSHARED'] = vars['LINKFORSHARED'].replace(framework, "-framework " + vars.get('PYTHONFRAMEWORK', 'Python'))
-for key in keys:
- print 'PYTHON_%s="%s"' % (key, vars.get(key, ''))
-]
-END_OF_PYTHON
-eval `$PYTHON sysconfig.py 2>/dev/null`
-if test -n "$PYTHON_INCDIR"; then
- AC_MSG_RESULT(ok)
-else
- AC_MSG_ERROR(["failed
-
-Run '$PYTHON sysconfig.py' to see what wrong.
-"])
-fi
-rm -f sysconfig.py
-AC_SUBST([PYTHON_INCDIR], [$PYTHON_INCDIR])
-AC_SUBST([PYTHON_BLDLIBRARY], [$PYTHON_BLDLIBRARY])
-AC_SUBST([PYTHON_LDFLAGS], [$PYTHON_LDFLAGS])
-AC_SUBST([PYTHON_LDLAST], [$PYTHON_LDLAST])
-AC_SUBST([PYTHON_LDLIBRARY], [$PYTHON_LDLIBRARY])
-AC_SUBST([PYTHON_LIBDIR], [$PYTHON_LIBDIR])
-AC_SUBST([PYTHON_LIBP], [$PYTHON_LIBP])
-AC_SUBST([PYTHON_LIBPL], [$PYTHON_LIBPL])
-AC_SUBST([PYTHON_LIBS], [$PYTHON_LIBS])
-AC_SUBST([PYTHON_LINKFORSHARED], [$PYTHON_LINKFORSHARED])
-AC_SUBST([PYTHON_MODLIBS], [$PYTHON_MODLIBS])
-AC_SUBST([PYTHON_SYSLIBS], [$PYTHON_SYSLIBS])
-])dnl CIT_PYTHON_SYSCONFIG
-dnl end of file
More information about the cig-commits
mailing list