LDS support for marriages

svn: r634
2001-12-19 02:02:59 +00:00
parent 9d5df95afc
commit a38d379e14
17 changed files with 662 additions and 342 deletions
--- a/119
+++ b/119
@@ -560,10 +560,15 @@ else
  echo "$ac_t""no" 1>&6
 fi

-# Extract the first word of "python1.5", so it can be a program name with args.
+
+PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
+
+if test "$PYTHON_VERSION" != "1.5" 
+then
+	# Extract the first word of "python1.5", so it can be a program name with args.
 set dummy python1.5; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:567: checking for $ac_word" >&5
+echo "configure:572: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON15'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -595,10 +600,16 @@ else
  echo "$ac_t""no" 1>&6
 fi

-# Extract the first word of "python2.0", so it can be a program name with args.
+else
+	PYTHON15=$PYTHON
+fi
+
+if test "$PYTHON_VERSION" != "2.0" 
+then
+	# Extract the first word of "python2.0", so it can be a program name with args.
 set dummy python2.0; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:602: checking for $ac_word" >&5
+echo "configure:613: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON20'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -630,10 +641,16 @@ else
  echo "$ac_t""no" 1>&6
 fi

-# Extract the first word of "python2.1", so it can be a program name with args.
+else
+	PYTHON20=$PYTHON
+fi
+
+if test "$PYTHON_VERSION" != "2.1" 
+then
+	# Extract the first word of "python2.1", so it can be a program name with args.
 set dummy python2.1; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:637: checking for $ac_word" >&5
+echo "configure:654: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON21'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -665,10 +682,16 @@ else
  echo "$ac_t""no" 1>&6
 fi

-# Extract the first word of "python2.2", so it can be a program name with args.
+else
+	PYTHON21=$PYTHON
+fi
+
+if test "$PYTHON_VERSION" != "2.2" 
+then
+	# Extract the first word of "python2.2", so it can be a program name with args.
 set dummy python2.2; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:672: checking for $ac_word" >&5
+echo "configure:695: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON22'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -700,10 +723,14 @@ else
  echo "$ac_t""no" 1>&6
 fi

+else
+	PYTHON22=$PYTHON
+fi
+
 # Extract the first word of "zip", so it can be a program name with args.
 set dummy zip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:707: checking for $ac_word" >&5
+echo "configure:734: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -736,8 +763,6 @@ else
 fi


-PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
-



@@ -775,7 +800,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:779: checking for a BSD compatible install" >&5
+echo "configure:804: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -828,7 +853,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:832: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:857: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -858,7 +883,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:862: checking for $ac_word" >&5
+echo "configure:887: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -888,7 +913,7 @@ if test -z "$CC"; then
  # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:892: checking for $ac_word" >&5
+echo "configure:917: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -939,7 +964,7 @@ fi
      # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:943: checking for $ac_word" >&5
+echo "configure:968: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -971,7 +996,7 @@ fi
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:975: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1000: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -982,12 +1007,12 @@ cross_compiling=$ac_cv_prog_cc_cross

 cat > conftest.$ac_ext << EOF

-#line 986 "configure"
+#line 1011 "configure"
 #include "confdefs.h"

 main(){return(0);}
 EOF
-if { (eval echo configure:991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  ac_cv_prog_cc_works=yes
  # If we can't run a trivial program, we are probably using a cross compiler.
  if (./conftest; exit) 2>/dev/null; then
@@ -1013,12 +1038,12 @@ if test $ac_cv_prog_cc_works = no; then
  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross

 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1022: checking whether we are using GNU C" >&5
+echo "configure:1047: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1027,7 +1052,7 @@ else
  yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
  ac_cv_prog_gcc=yes
 else
  ac_cv_prog_gcc=no
@@ -1046,7 +1071,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1050: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1079,7 +1104,7 @@ fi


 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1083: checking how to run the C preprocessor" >&5
+echo "configure:1108: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
  CPP=
@@ -1094,13 +1119,13 @@ else
  # On the NeXT, cc -E runs the code through the compiler's parser,
  # not just through cpp.
  cat > conftest.$ac_ext <<EOF
-#line 1098 "configure"
+#line 1123 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  :
@@ -1111,13 +1136,13 @@ else
  rm -rf conftest*
  CPP="${CC-cc} -E -traditional-cpp"
  cat > conftest.$ac_ext <<EOF
-#line 1115 "configure"
+#line 1140 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  :
@@ -1128,13 +1153,13 @@ else
  rm -rf conftest*
  CPP="${CC-cc} -nologo -E"
  cat > conftest.$ac_ext <<EOF
-#line 1132 "configure"
+#line 1157 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  :
@@ -1160,17 +1185,17 @@ echo "$ac_t""$CPP" 1>&6

 ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:1164: checking for libintl.h" >&5
+echo "configure:1189: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 1169 "configure"
+#line 1194 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -1193,7 +1218,7 @@ fi


 echo $ac_n "checking for textdomain in -lc""... $ac_c" 1>&6
-echo "configure:1197: checking for textdomain in -lc" >&5
+echo "configure:1222: checking for textdomain in -lc" >&5
 ac_lib_var=`echo c'_'textdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1201,7 +1226,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1205 "configure"
+#line 1230 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1212,7 +1237,7 @@ int main() {
 textdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1231,7 +1256,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
  echo "$ac_t""no" 1>&6
 echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6
-echo "configure:1235: checking for textdomain in -lintl" >&5
+echo "configure:1260: checking for textdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1239,7 +1264,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1243 "configure"
+#line 1268 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1250,7 +1275,7 @@ int main() {
 textdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:1254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1279,7 +1304,7 @@ fi
 # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1283: checking for $ac_word" >&5
+echo "configure:1308: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GNOME_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1310,7 +1335,7 @@ GNOMEHELP=`gnome-config --prefix`


 echo $ac_n "checking Python bindings for sax/xml""... $ac_c" 1>&6
-echo "configure:1314: checking Python bindings for sax/xml" >&5
+echo "configure:1339: checking Python bindings for sax/xml" >&5

 cat > conftest.py <<EOF
 try:
@@ -1343,7 +1368,7 @@ fi
 echo "$ac_t""ok" 1>&6

 echo $ac_n "checking Python bindings for gtk+""... $ac_c" 1>&6
-echo "configure:1347: checking Python bindings for gtk+" >&5
+echo "configure:1372: checking Python bindings for gtk+" >&5

 cat > conftest.py <<EOF
 try:
@@ -1369,7 +1394,7 @@ fi
 echo "$ac_t""ok" 1>&6

 echo $ac_n "checking Python bindings for GNOME""... $ac_c" 1>&6
-echo "configure:1373: checking Python bindings for GNOME" >&5
+echo "configure:1398: checking Python bindings for GNOME" >&5

 cat > conftest.py <<EOF
 try:
@@ -1395,7 +1420,7 @@ fi
 echo "$ac_t""ok" 1>&6

 echo $ac_n "checking Python/libglade bindings""... $ac_c" 1>&6
-echo "configure:1399: checking Python/libglade bindings" >&5
+echo "configure:1424: checking Python/libglade bindings" >&5

 cat > conftest.py <<EOF
 try:
@@ -1421,7 +1446,7 @@ fi
 echo "$ac_t""ok" 1>&6

 echo $ac_n "checking Python/GNOME bindings for libglade""... $ac_c" 1>&6
-echo "configure:1425: checking Python/GNOME bindings for libglade" >&5
+echo "configure:1450: checking Python/GNOME bindings for libglade" >&5

 cat > conftest.py <<EOF
 try:
@@ -1449,9 +1474,8 @@ echo "$ac_t""ok" 1>&6


 echo $ac_n "checking for headers required to compile python extensions""... $ac_c" 1>&6
-echo "configure:1453: checking for headers required to compile python extensions" >&5
+echo "configure:1478: checking for headers required to compile python extensions" >&5

-echo $PYTHON15
 if test "$PYTHON15" != ""; then
  py_prefix=`$PYTHON15 -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON15 -c "import sys; print sys.exec_prefix"`
@@ -1489,7 +1513,6 @@ fi


 if test "$PYTHON22" != ""; then
-  INTLLIBS="${INTLLIBS}intl22.so "
  py_prefix=`$PYTHON22 -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON22 -c "import sys; print sys.exec_prefix"`
  P22_INCLUDES="-I${py_prefix}/include/python2.2"