Changeset bd63e0 in git

Timestamp:

Dec 6, 2002, 6:44:11 PM (21 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ca28c1eba7cbb2e04b96af26299ec04175604efb

Parents:

98fab10db33e48283a3c4f3908092986b98fdca0

Message:

plural adjustments


git-svn-id: file:///usr/local/Singular/svn/trunk@6362 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/configure (modified) (3 diffs)
• Singular/configure.in (modified) (2 diffs)
• configure (modified) (15 diffs)
• configure.in (modified) (1 diff)

Singular/configure

@@ -41 +41 @@
   --with-apint=PACKAGE    use PACKAGE for arbitary integer arithmetic"
 ac_help="$ac_help
-  --with-plural           do compile with Plural support"
+  --with-Plural           do compile with Plural support"
 ac_help="$ac_help
   --with-NTL              build for use with NTL."
@@ -3647 +3647 @@
 fi
 
-# Check whether --with-plural or --without-plural was given.
-if test "${with_plural+set}" = set; then
-  withval="$with_plural"
+# Check whether --with-Plural or --without-Plural was given.
+if test "${with_Plural+set}" = set; then
+  withval="$with_Plural"
   :
 fi
@@ -4813 +4813 @@
 echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
 echo "configure:4815: checking whether to have Plural" >&5
-if test "$with_plural" != yes; then
+if test "$with_Plural" != yes && test "$enable_Plural" != yes; then
   echo "$ac_t""no" 1>&6
 else

Singular/configure.in

@@ -492 +492 @@
   [  --with-apint=PACKAGE    use PACKAGE for arbitary integer arithmetic])
 AC_ARG_WITH(
-  plural,
-  [  --with-plural           do compile with Plural support])
+  Plural,
+  [  --with-Plural           do compile with Plural support])
 AC_ARG_WITH(
   NTL,
@@ -848 +848 @@
 
 AC_MSG_CHECKING(whether to have Plural)
-if test "$with_plural" != yes; then
+if test "$with_Plural" != yes && test "$enable_Plural" != yes; then
   AC_MSG_RESULT(no)
 else

configure

@@ -2603 +2603 @@
 echo $ac_n "checking whether to build Plural""... $ac_c" 1>&6
 echo "configure:2605: checking whether to build Plural" >&5
-if test "$enable_Plural" != no && test -d "Plural"; then
-   BUILD_SUBDIRS="$BUILD_SUBDIRS Plural"
+if test "$enable_Plural" != no || test "$with_Plural" != no; then
    echo "$ac_t""yes" 1>&6
    if test "$enable_Plural" != yes; then
@@ -2615 +2614 @@
 
 echo $ac_n "checking whether to configure and build Texinfo""... $ac_c" 1>&6
-echo "configure:2618: checking whether to configure and build Texinfo" >&5
+echo "configure:2617: checking whether to configure and build Texinfo" >&5
 if test "$enable_Texinfo" != no && test -d Texinfo; then
   echo "$ac_t""yes" 1>&6
@@ -2637 +2636 @@
 set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2640: checking for $ac_word" >&5
+echo "configure:2639: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2667 +2666 @@
 set dummy texi2dvi; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2670: checking for $ac_word" >&5
+echo "configure:2669: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXI2DVI'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2697 +2696 @@
 set dummy texindex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2700: checking for $ac_word" >&5
+echo "configure:2699: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXINDEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2727 +2726 @@
 
 echo $ac_n "checking whether to configure and build Texi2html""... $ac_c" 1>&6
-echo "configure:2730: checking whether to configure and build Texi2html" >&5
+echo "configure:2729: checking whether to configure and build Texi2html" >&5
 if test "$enable_Texi2html" != no && test -d Texi2html; then
  echo "$ac_t""yes" 1>&6
@@ -2742 +2741 @@
 set dummy texi2html; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2745: checking for $ac_word" >&5
+echo "configure:2744: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXI2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2780 +2779 @@
 
 echo $ac_n "checking whether to build doc""... $ac_c" 1>&6
-echo "configure:2783: checking whether to build doc" >&5
+echo "configure:2782: checking whether to build doc" >&5
 if test "$enable_doc" != no && test -d doc; then
  echo "$ac_t""yes" 1>&6
@@ -2794 +2793 @@
 
 echo $ac_n "checking whether to build emacs""... $ac_c" 1>&6
-echo "configure:2797: checking whether to build emacs" >&5
+echo "configure:2796: checking whether to build emacs" >&5
 if test "$enable_doc" = yes && test "$enable_emacs" != no && test -d emacs; then
  echo "$ac_t""yes" 1>&6
@@ -2806 +2805 @@
 
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:2809: checking which apint package to use" >&5
+echo "configure:2808: checking which apint package to use" >&5
 if test "$with_apint" = gmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -2830 +2829 @@
 
 echo $ac_n "checking whether to use with MP""... $ac_c" 1>&6
-echo "configure:2833: checking whether to use with MP" >&5
+echo "configure:2832: checking whether to use with MP" >&5
 if test "$with_MP" = yes; then
   if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
@@ -2849 +2848 @@
 
 echo $ac_n "checking whether to use with factory""... $ac_c" 1>&6
-echo "configure:2852: checking whether to use with factory" >&5
+echo "configure:2851: checking whether to use with factory" >&5
 if test "$with_factory" = yes; then
   if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
@@ -2868 +2867 @@
   
 echo $ac_n "checking whether to use with libfac""... $ac_c" 1>&6
-echo "configure:2871: checking whether to use with libfac" >&5
+echo "configure:2870: checking whether to use with libfac" >&5
 if test "$with_libfac" = yes; then
   if test "$ac_libfac_ok" = yes || test "$enable_libfac" = yes; then
@@ -2889 +2888 @@
 
 echo $ac_n "checking whether to use with Singular""... $ac_c" 1>&6
-echo "configure:2892: checking whether to use with Singular" >&5
+echo "configure:2891: checking whether to use with Singular" >&5
 if test "$with_Singular" != no && test "$with_Singular" != yes; then
   if test "$enable_Singular" = yes; then
@@ -2951 +2950 @@
   
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2954: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2953: 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

configure.in

@@ -627 +627 @@
 
 AC_MSG_CHECKING(whether to build Plural)
-if test "$enable_Plural" != no && test -d "Plural"; then
-   BUILD_SUBDIRS="$BUILD_SUBDIRS Plural"
+if test "$enable_Plural" != no || test "$with_Plural" != no; then
    AC_MSG_RESULT(yes)
    if test "$enable_Plural" != yes; then