Changeset dc32d42 in git for configure


Ignore:
Timestamp:
May 21, 1997, 3:05:36 PM (27 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
2b3f238c740deb3d586dc1d5b379ddadb848cbaa
Parents:
670667a17a4a8423dbd6c8e3749cc652102fb28a
Message:
Merged fixes from 1-0 branch


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

Legend:

Unmodified
Added
Removed
  • configure

    r670667 rdc32d42  
    874874fi
    875875
     876echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
     877if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
     878  echo $ac_n "(cached) $ac_c" 1>&6
     879else
     880  cat > conftest.$ac_ext <<EOF
     881#line 882 "configure"
     882#include "confdefs.h"
     883#ifdef _AIX
     884    yes
     885#endif
     886
     887EOF
     888if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     889  egrep "yes" >/dev/null 2>&1; then
     890  rm -rf conftest*
     891  ac_cv_is_aix=yes
     892else
     893  rm -rf conftest*
     894  ac_cv_is_aix=no
     895fi
     896rm -f conftest*
     897
     898fi
     899
     900if test "$ac_cv_is_aix" = yes; then
     901  echo "$ac_t""yes" 1>&6
     902else
     903  echo "$ac_t""no" 1>&6
     904fi
    876905
    877906
     
    884913LIBS="-lm  $LIBS"
    885914cat > conftest.$ac_ext <<EOF
    886 #line 887 "configure"
     915#line 916 "configure"
    887916#include "confdefs.h"
    888917/* Override any gcc2 internal prototype to avoid an error.  */
     
    894923; return 0; }
    895924EOF
    896 if { (eval echo configure:897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     925if { (eval echo configure:926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    897926  rm -rf conftest*
    898927  eval "ac_cv_lib_$ac_lib_var=yes"
     
    926955LIBS="-lgmp  $LIBS"
    927956cat > conftest.$ac_ext <<EOF
    928 #line 929 "configure"
     957#line 958 "configure"
    929958#include "confdefs.h"
    930959/* Override any gcc2 internal prototype to avoid an error.  */
     
    936965; return 0; }
    937966EOF
    938 if { (eval echo configure:939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     967if { (eval echo configure:968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    939968  rm -rf conftest*
    940969  eval "ac_cv_lib_$ac_lib_var=yes"
     
    968997LIBS="-lMP  $LIBS"
    969998cat > conftest.$ac_ext <<EOF
    970 #line 971 "configure"
     999#line 1000 "configure"
    9711000#include "confdefs.h"
    9721001/* Override any gcc2 internal prototype to avoid an error.  */
     
    9781007; return 0; }
    9791008EOF
    980 if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1009if { (eval echo configure:1010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    9811010  rm -rf conftest*
    9821011  eval "ac_cv_lib_$ac_lib_var=yes"
     
    10101039LIBS="-lMPT  $LIBS"
    10111040cat > conftest.$ac_ext <<EOF
    1012 #line 1013 "configure"
     1041#line 1042 "configure"
    10131042#include "confdefs.h"
    10141043/* Override any gcc2 internal prototype to avoid an error.  */
     
    10201049; return 0; }
    10211050EOF
    1022 if { (eval echo configure:1023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1051if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    10231052  rm -rf conftest*
    10241053  eval "ac_cv_lib_$ac_lib_var=yes"
     
    10521081LIBS="-lsingcf  $LIBS"
    10531082cat > conftest.$ac_ext <<EOF
    1054 #line 1055 "configure"
     1083#line 1084 "configure"
    10551084#include "confdefs.h"
    10561085/* Override any gcc2 internal prototype to avoid an error.  */
     
    10621091; return 0; }
    10631092EOF
    1064 if { (eval echo configure:1065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1093if { (eval echo configure:1094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    10651094  rm -rf conftest*
    10661095  eval "ac_cv_lib_$ac_lib_var=yes"
     
    10941123LIBS="-lsingfac  $LIBS"
    10951124cat > conftest.$ac_ext <<EOF
    1096 #line 1097 "configure"
     1125#line 1126 "configure"
    10971126#include "confdefs.h"
    10981127/* Override any gcc2 internal prototype to avoid an error.  */
     
    11041133; return 0; }
    11051134EOF
    1106 if { (eval echo configure:1107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     1135if { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    11071136  rm -rf conftest*
    11081137  eval "ac_cv_lib_$ac_lib_var=yes"
     
    11371166else
    11381167  cat > conftest.$ac_ext <<EOF
    1139 #line 1140 "configure"
     1168#line 1169 "configure"
    11401169#include "confdefs.h"
    11411170#include <$ac_hdr>
    11421171EOF
    11431172ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1144 { (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1173{ (eval echo configure:1174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    11451174ac_err=`grep -v '^ *+' conftest.out`
    11461175if test -z "$ac_err"; then
     
    11691198if test "$ac_cv_lib_gmp_mpz_init" = yes && \
    11701199 test "$ac_cv_header_gmp_h" = yes; then
    1171   if echo $target_os | egrep aix; then
    1172     cat > conftest.$ac_ext <<EOF
    1173 #line 1174 "configure"
    1174 #include "confdefs.h"
    1175 \
    1176      #include <gmp.h>
    1177     #if defined(__GNU_MP_VERSION) &&  __GNU_MP_VERSION == 2
    1178     no
    1179     #else
    1180     yes
    1181     #endif
    1182    
    1183 EOF
    1184 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    1185   egrep "yes" >/dev/null 2>&1; then
    1186   rm -rf conftest*
    1187   ac_gmp_ok=yes
    1188 else
    1189   rm -rf conftest*
    1190   echo "configure: warning: Found gmp lib version>2 which is broken under AIX: Can not use it" 1>&2
    1191 fi
    1192 rm -f conftest*
    1193 
    1194   else
    11951200    ac_gmp_ok=yes
    1196   fi
    11971201fi
    11981202
     
    12561260fi
    12571261if test "$enable_gmp" = yes && test -d gmp; then
    1258   echo "$ac_t""yes" 1>&6
    1259   CONFIG_SUBDIRS="gmp"
    1260   ac_configure_args="$ac_configure_args --enable-gmp"
     1262  if test "$ac_cv_is_aix" = yes && test "$GCC" = yes; then
     1263    echo "$ac_t""no" 1>&6
     1264    echo "configure: warning: Building gmp v2 with gcc results in a gmp lib with bugs" 1>&2
     1265    echo "configure: warning: Install gmp v2 with another compiler first or use gmp v1.3" 1>&2
     1266    echo "configure: warning: For the time being gmp is neither configured/built nor used" 1>&2
     1267    enable_gmp=no
     1268    ac_configure_args="$ac_configure_args --disable-gmp"
     1269  else
     1270    echo "$ac_t""yes" 1>&6
     1271    CONFIG_SUBDIRS="gmp"
     1272    ac_configure_args="$ac_configure_args --enable-gmp"
     1273  fi
    12611274else
    12621275  echo "$ac_t""no" 1>&6
     
    12771290fi
    12781291if test "$enable_MP" = yes && test -d MP; then
    1279   echo "$ac_t""yes" 1>&6
    1280   CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
    1281   ac_configure_args="$ac_configure_args --enable-MP"
     1292  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
     1293    echo "$ac_t""yes" 1>&6
     1294    CONFIG_SUBDIRS="$CONFIG_SUBDIRS MP"
     1295    ac_configure_args="$ac_configure_args --enable-MP"
     1296  else
     1297    echo "$ac_t""no" 1>&6
     1298    echo "configure: warning: Can not build MP for Singular without having gmp" 1>&2
     1299    enable_MP=no
     1300    ac_configure_args="$ac_configure_args --disable-MP"
     1301  fi
    12821302else
    12831303  echo "$ac_t""no" 1>&6
     
    12981318fi
    12991319if test "$enable_factory" = yes && test -d factory; then
     1320  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
    13001321  echo "$ac_t""yes" 1>&6
    13011322  CONFIG_SUBDIRS="$CONFIG_SUBDIRS factory"
    13021323  ac_configure_args="$ac_configure_args --enable-factory"
     1324  else
     1325    echo "$ac_t""no" 1>&6
     1326    echo "configure: warning: Can not build factory without having gmp" 1>&2
     1327    enable_factory=no
     1328    ac_configure_args="$ac_configure_args --disable-factory"
     1329  fi
    13031330else
    13041331  echo "$ac_t""no" 1>&6
     
    13191346fi
    13201347if test "$enable_libfac" = yes && test -d libfac; then
     1348  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
    13211349  echo "$ac_t""yes" 1>&6
    13221350  CONFIG_SUBDIRS="$CONFIG_SUBDIRS libfac"
    13231351  ac_configure_args="$ac_configure_args --enable-libfac"
     1352  else
     1353    echo "$ac_t""no" 1>&6
     1354    echo "configure: warning: Can not build libfac without factory" 1>&2
     1355    enable_libfac=no
     1356    ac_configure_args="$ac_configure_args --disable-libfac"
     1357  fi
    13241358else
    13251359  echo "$ac_t""no" 1>&6
     
    13331367echo $ac_n "checking whether to configure and build Singular""... $ac_c" 1>&6
    13341368if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
    1335   if test "$with_Singular" != no && test "$ac_Singular_ok" != yes; then
     1369  if test "$with_Singular" != no; then
    13361370    enable_Singular=yes
    13371371  else
     
    13531387
    13541388
    1355 echo $ac_n "checking whether to use gmp""... $ac_c" 1>&6
    1356 if test "$with_gmp" != no; then
    1357   if test "$ac_gmp_ok" != yes; then
    1358     if test "$enable_gmp" = yes; then
    1359       if echo $target_os | egrep aix; then
    1360         ac_with_gmp=no
    1361         ac_aix_warn=yes
    1362       else
    1363         ac_with_gmp=yes
    1364       fi
    1365     else
    1366       ac_with_gmp=no
    1367     fi
    1368   else
    1369     ac_with_gmp=yes
    1370   fi
    1371   if test "$ac_with_gmp"=yes; then
    1372     if test "$with_gmp" != yes; then
    1373       with_gmp=yes
    1374       ac_configure_args="$ac_configure_args --with-gmp"
    1375     fi
     1389echo $ac_n "checking whether to use with gmp""... $ac_c" 1>&6
     1390if test "$with_gmp" != no && test "$with_gmp" != yes; then
     1391  if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
     1392    with_gmp=yes
    13761393  else
    13771394    with_gmp=no
    1378     ac_configure_args="$ac_configure_args --without-gmp"
    1379   fi
    1380 fi
    1381 if test "$with_gmp" != no; then
     1395  fi
     1396  ac_configure_args="$ac_configure_args --with-gmp=$with_gmp"
     1397fi
     1398if test "$with_gmp" = yes; then
    13821399  echo "$ac_t""yes" 1>&6
    13831400else
    13841401  echo "$ac_t""no" 1>&6
    13851402fi
    1386 if test "$ac_aix_warn" = yes; then
    1387   echo "configure: warning: gmp version 2 has a bug under AIX" 1>&2
    1388 fi
    1389 
    1390 echo $ac_n "checking whether to use MP""... $ac_c" 1>&6
    1391 if test "$with_MP" != no; then
    1392   if test "$ac_MP_ok" != yes; then
    1393     if test "$enable_MP" = yes; then
    1394       if test "$with_gmp" != yes; then
    1395         ac_with_MP=no
    1396         ac_gmp_warn=yes
    1397       else
    1398         ac_with_MP=yes
    1399       fi
    1400     else
    1401       ac_with_MP=no
    1402     fi
    1403   else
    1404     ac_with_MP=yes
    1405   fi
    1406   if test "$ac_with_MP"=yes; then
    1407     if test "$with_MP" != yes; then
    1408       with_MP=yes
    1409       ac_configure_args="$ac_configure_args --with-MP"
    1410     fi
     1403
     1404echo $ac_n "checking whether to use with MP""... $ac_c" 1>&6
     1405if test "$with_MP" != no && test "$with_MP" != yes; then
     1406  if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
     1407    with_MP=yes
    14111408  else
    14121409    with_MP=no
    1413     ac_configure_args="$ac_configure_args --without-MP"
    1414   fi
    1415 fi
    1416 if test "$with_MP" != no; then
     1410  fi
     1411  ac_configure_args="$ac_configure_args --with-MP=$with_MP"
     1412fi
     1413if test "$with_MP" = yes; then
    14171414  echo "$ac_t""yes" 1>&6
    14181415else
    14191416  echo "$ac_t""no" 1>&6
    14201417fi
    1421 if test "$ac_gmp_warn" = yes; then
    1422   echo "configure: warning: Need gmp to use MP" 1>&2
    1423 fi
    1424 
    1425 echo $ac_n "checking whether to use factory""... $ac_c" 1>&6
    1426 if test "$with_factory" != no; then
    1427   if test "$ac_factory_ok" != yes; then
    1428     if test "$enable_factory" = yes; then
    1429       if test "$with_gmp" != yes; then
    1430         ac_with_factory=no
    1431         ac_gmp_warn=yes
    1432       else
    1433         ac_with_factory=yes
    1434       fi
    1435     else
    1436       ac_with_factory=no
    1437     fi
    1438   else
    1439     ac_with_factory=yes
    1440   fi
    1441   if test "$ac_with_factory"=yes; then
    1442     if test "$with_factory" != yes; then
    1443       with_factory=yes
    1444       ac_configure_args="$ac_configure_args --with-factory"
    1445     fi
     1418
     1419echo $ac_n "checking whether to use with factory""... $ac_c" 1>&6
     1420if test "$with_factory" != no && test "$with_factory" != yes; then
     1421  if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
     1422    with_factory=yes
    14461423  else
    14471424    with_factory=no
    1448     ac_configure_args="$ac_configure_args --without-factory"
    1449   fi
    1450 fi
    1451 if test "$with_factory" != no; then
     1425  fi
     1426  ac_configure_args="$ac_configure_args --with-factory=$with_factory"
     1427fi
     1428if test "$with_factory" = yes; then
    14521429  echo "$ac_t""yes" 1>&6
    14531430else
    14541431  echo "$ac_t""no" 1>&6
    14551432fi
    1456 if test "$ac_gmp_warn" = yes; then
    1457   echo "configure: warning: Need gmp to use factory" 1>&2
    1458 fi
    1459  
    1460 echo $ac_n "checking whether to use libfac""... $ac_c" 1>&6
    1461 if test "$with_libfac" != no; then
    1462   if test "$ac_libfac_ok" != yes; then
    1463     if test "$enable_libfac" = yes; then
    1464       if test "$with_gmp" != yes || test "$with_factory" != yes; then
    1465         ac_with_libfac=no
    1466         ac_gmp_warn=yes
    1467       else
    1468         ac_with_libfac=yes
    1469       fi
    1470     else
    1471       ac_with_libfac=no
    1472     fi
    1473   else
    1474     ac_with_libfac=yes
    1475   fi
    1476   if test "$ac_with_libfac"=yes; then
    1477     if test "$with_libfac" != yes; then
    1478       with_libfac=yes
    1479       ac_configure_args="$ac_configure_args --with-libfac"
    1480     fi
     1433
     1434echo $ac_n "checking whether to use with libfac""... $ac_c" 1>&6
     1435if test "$with_libfac" != no && test "$with_libfac" != yes; then
     1436  if test "$ac_libfac_ok" = yes || test "$enable_libfac" = yes; then
     1437    with_libfac=yes
    14811438  else
    14821439    with_libfac=no
    1483     ac_configure_args="$ac_configure_args --without-libfac"
    1484   fi
    1485 fi
    1486 if test "$with_libfac" != no; then
     1440  fi
     1441  ac_configure_args="$ac_configure_args --with-libfac=$with_libfac"
     1442fi
     1443if test "$with_libfac" = yes; then
    14871444  echo "$ac_t""yes" 1>&6
    14881445else
    14891446  echo "$ac_t""no" 1>&6
    14901447fi
    1491 if test "$ac_gmp_warn" = yes; then
    1492   echo "configure: warning: Need gmp and factory to use libfac" 1>&2
    1493 fi
    1494 
    1495 echo $ac_n "checking whether to build with Singular""... $ac_c" 1>&6
    1496 if test "$with_Singular" != no; then
     1448
     1449echo $ac_n "checking whether to use with Singular""... $ac_c" 1>&6
     1450if test "$with_Singular" != no && test "$with_Singular" != yes; then
    14971451  if test "$enable_Singular" = yes; then
    1498         ac_with_Singular=yes
    1499   else
    1500     ac_with_Singular=no
    1501   fi
    1502   if test "$ac_with_Singular"=yes; then
    1503     if test "$with_Singular" != yes; then
    1504       with_Singular=yes
    1505       ac_configure_args="$ac_configure_args --with-Singular"
    1506     fi
     1452    with_Singular=yes
    15071453  else
    15081454    with_Singular=no
    1509     ac_configure_args="$ac_configure_args --without-Singular"
    1510   fi
    1511 fi
     1455  fi
     1456  ac_configure_args="$ac_configure_args --with-Singular=$with_Singular"
     1457fi
     1458
    15121459if test "$with_Singular" != no; then
    15131460  echo "$ac_t""yes" 1>&6
     
    18681815  done
    18691816fi
     1817
Note: See TracChangeset for help on using the changeset viewer.