Changeset 0164d0 in git

Timestamp:

Aug 27, 1997, 3:39:09 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

7ae51b5a795c3ecc4ee43ff82fe0afc9f81876e6

Parents:

bd003130ba3f37eafd59ba2ce081bb2186feda75

Message:

Wed Aug 27 15:35:00 1997  Olaf Bachmann
<obachman@mathematik.uni-kl.de>

	* added file README.mac, README.dos; added dosdist target to
	  Makefile.in, small changes for clean dos-compilation and
	  distribution
	* added reqeust to register to README and COPYING files


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

Files:

• Makefile.in (modified) (3 diffs)
• README.dos (added)
• README.mac (added)
• Singular/configure (modified) (91 diffs)
• Singular/configure.in (modified) (3 diffs)

Makefile.in

@@ -75 +75 @@
         gzip -9 ${BINDISTNAME}
 
+dosdist: Singular/Singular.exe
+        mkdir /tmp/singdos
+        mkdir /tmp/singdos/Singular
+        mkdir /tmp/singdos/Singular/info
+        mkdir /tmp/singdos/Singular/share
+        mkdir /tmp/singdos/Singular/share/Singular
+        cp Singular/doc/singular.hlp /tmp/singdos/Singular/info
+        cp Singular/Singular.exe /tmp/singdos/Singular
+        cp Singular/LIB/*.lib /tmp/singdos/Singular/share/Singular
+        cp -R Singular/LIB/gftables /tmp/singdos/Singular/share/Singular
+        cp COPYING.share /tmp/singdos/Singular/COPYING
+        cp README.dos /tmp/singdos/Singular/README
+        cd /tmp/singdos/; zip -k -r sing Singular; cd -
+        mv /tmp/singdos/sing.zip Singular.zip
+        /bin/rm -rf /tmp/singdos
+
 sharedist: ${bindir}/Singular
         cd Singular; ${MAKE} dvi; ${MAKE} info
@@ -99 +115 @@
         ${MAKE} install 
 
+Singular/Singular.exe:
+        ./configure.dos
+        ${MAKE} clean
+        ${MAKE} install
+
 Singular factory libfac MP gmp:
         cd $@; ${MAKE} all
@@ -104 +125 @@
 check:
         cd Singular; ${MAKE} check
-        
+
 Makefile : Makefile.in config.status
         ./config.status

Singular/configure

@@ -579 +579 @@
   singularinfodir=$infodir;
 fi
-cat >> confdefs.h <<EOF
-#define SINGULAR_DATADIR "${singulardatadir}"
-EOF
-
-cat >> confdefs.h <<EOF
-#define SINGULAR_INFODIR "${singularinfodir}"
-EOF
-
-
-
 
 
@@ -693 +683 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:696: \"$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:686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -745 +735 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 748 "configure"
+#line 738 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -751 +741 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -760 +750 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 763 "configure"
+#line 753 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -766 +756 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -829 +819 @@
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
@@ -901 +891 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 904 "configure"
+#line 894 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-{ (eval echo configure:908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_c_cross=no
@@ -926 +916 @@
   DOS_CROSS=no
 fi
+
+
+if test "$ac_c_cross_dos" = yes; then
+  cat >> confdefs.h <<\EOF
+#define SINGULAR_DATADIR "share\\Singular"
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define SINGULAR_INFODIR "info"
+EOF
+
+else
+  cat >> confdefs.h <<EOF
+#define SINGULAR_DATADIR "${singulardatadir}"
+EOF
+
+  cat >> confdefs.h <<EOF
+#define SINGULAR_INFODIR "${singularinfodir}"
+EOF
+
+fi
+
 
 
@@ -1055 +1067 @@
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1058 "configure"
+#line 1070 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1065 +1077 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1097 +1109 @@
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1100 "configure"
+#line 1112 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1107 +1119 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1139 +1151 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1142 "configure"
+#line 1154 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1149 +1161 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1181 +1193 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1184 "configure"
+#line 1196 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1191 +1203 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1225 +1237 @@
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1228 "configure"
+#line 1240 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1235 +1247 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1266 +1278 @@
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1269 "configure"
+#line 1281 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1276 +1288 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1307 +1319 @@
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1310 "configure"
+#line 1322 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1317 +1329 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1353 +1365 @@
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1356 "configure"
+#line 1368 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1363 +1375 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1396 +1408 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1399 "configure"
+#line 1411 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1455 +1467 @@
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1458 "configure"
+#line 1470 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1465 +1477 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1496 +1508 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1499 "configure"
+#line 1511 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1506 +1518 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1538 +1550 @@
 LIBS="-lsmallgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1541 "configure"
+#line 1553 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1548 +1560 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1580 +1592 @@
 LIBS="-lMP  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1583 "configure"
+#line 1595 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1590 +1602 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1622 +1634 @@
 LIBS="-lMPT  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1625 "configure"
+#line 1637 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1632 +1644 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1664 +1676 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1667 "configure"
+#line 1679 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1674 +1686 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1706 +1718 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1709 "configure"
+#line 1721 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1716 +1728 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1749 +1761 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1752 "configure"
+#line 1764 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1949 +1961 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1952 "configure"
+#line 1964 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1957 +1969 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1972 +1984 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1975 "configure"
+#line 1987 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -1990 +2002 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1993 "configure"
+#line 2005 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2011 +2023 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2014 "configure"
+#line 2026 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -2022 +2034 @@
 
 EOF
-{ (eval echo configure:2025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   :
@@ -2050 +2062 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2053 "configure"
+#line 2065 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2089 +2101 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2092 "configure"
+#line 2104 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -2138 +2150 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2141 "configure"
+#line 2153 "configure"
 #include "confdefs.h"
 
@@ -2188 +2200 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -2214 +2226 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2217 "configure"
+#line 2229 "configure"
 #include "confdefs.h"
 
@@ -2222 +2234 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -2250 +2262 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2253 "configure"
+#line 2265 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2281 +2293 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2284 "configure"
+#line 2296 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2291 +2303 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
@@ -2315 +2327 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2318 "configure"
+#line 2330 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2324 +2336 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
@@ -2351 +2363 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2354 "configure"
+#line 2366 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2359 +2371 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2383 +2395 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2386 "configure"
+#line 2398 "configure"
 #include "confdefs.h"
 
@@ -2407 +2419 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   ac_cv_func_alloca=yes
@@ -2442 +2454 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
+#line 2457 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2471 +2483 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2474 "configure"
+#line 2486 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2493 +2505 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2525 +2537 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2528 "configure"
+#line 2540 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -2544 +2556 @@
 }
 EOF
-{ (eval echo configure:2547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_c_stack_direction=1
@@ -2568 +2580 @@
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 2571 "configure"
+#line 2583 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
@@ -2586 +2598 @@
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 2589 "configure"
+#line 2601 "configure"
 #include "confdefs.h"
 #include <termio.h>
@@ -2614 +2626 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2617 "configure"
+#line 2629 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2636 +2648 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2666 +2678 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2669 "configure"
+#line 2681 "configure"
 #include "confdefs.h"
 
@@ -2735 +2747 @@
 
 EOF
-{ (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_func_mmap=yes
@@ -2758 +2770 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2761 "configure"
+#line 2773 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -2776 +2788 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
@@ -2798 +2810 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2801 "configure"
+#line 2813 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2820 +2832 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
@@ -2846 +2858 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2849 "configure"
+#line 2861 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2868 +2880 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
@@ -2897 +2909 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2900 "configure"
+#line 2912 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2919 +2931 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2956 +2968 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2959 "configure"
+#line 2971 "configure"
 #include "confdefs.h"
  int main() { if (-2 >> 1 == -1) exit(0); else exit(1); } 
 EOF
-{ (eval echo configure:2963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_shift=yes
@@ -2992 +3004 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 2995 "configure"
+#line 3007 "configure"
 #include "confdefs.h"
  int main() {if (sizeof(int) == 4)  exit(0); else exit(1); } 
 EOF
-{ (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_int_equals_four=yes
@@ -3027 +3039 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3030 "configure"
+#line 3042 "configure"
 #include "confdefs.h"
  int main() {if (sizeof(long) == sizeof(void*))  exit(0); else exit(1); }
 EOF
-{ (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_long_equals_voidp=yes
@@ -3056 +3068 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3059 "configure"
+#line 3071 "configure"
 #include "confdefs.h"
 #include <stdio.h> 
  main() { char *str=(char*)malloc(20); if (((int) sprintf(str,"123456789")) == 9) exit(0); else exit(1); }
 EOF
-{ (eval echo configure:3064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_returns_n_of_chars=yes
@@ -3089 +3101 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 3092 "configure"
+#line 3104 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3100 +3112 @@
 }
 EOF
-{ (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:3115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -3122 +3134 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3125 "configure"
+#line 3137 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -3146 +3158 @@
   echo "$ac_t""no" 1>&6
 fi
-
 
 if test ${GXX} = yes; then
@@ -3288 +3299 @@
 s%@SINGULAR_MINOR_VERSION@%$SINGULAR_MINOR_VERSION%g
 s%@SINGULAR_SUB_VERSION@%$SINGULAR_SUB_VERSION%g
-s%@singulardatadir@%$singulardatadir%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
@@ -3294 +3304 @@
 s%@SET_MAKE@%$SET_MAKE%g
 s%@DOS_CROSS@%$DOS_CROSS%g
+s%@singulardatadir@%$singulardatadir%g
 s%@INFO@%$INFO%g
 s%@WITH_MP@%$WITH_MP%g

Singular/configure.in

@@ -43 +43 @@
   singularinfodir=$infodir;
 fi
-AC_DEFINE_UNQUOTED(SINGULAR_DATADIR, "${singulardatadir}")
-AC_DEFINE_UNQUOTED(SINGULAR_INFODIR, "${singularinfodir}")
-
-AC_SUBST(singulardatadir)
 
 dnl
@@ -84 +80 @@
 fi
 AC_SUBST(DOS_CROSS)
+
+if test "$ac_c_cross_dos" = yes; then
+  AC_DEFINE(SINGULAR_DATADIR, "share\\Singular")
+  AC_DEFINE(SINGULAR_INFODIR, "info")
+else
+  AC_DEFINE_UNQUOTED(SINGULAR_DATADIR, "${singulardatadir}")
+  AC_DEFINE_UNQUOTED(SINGULAR_INFODIR, "${singularinfodir}")
+fi
+AC_SUBST(singulardatadir)
+
 
 dnl we prefer using gcc for compiling C++ files, provided the user did
@@ -500 +506 @@
 fi
 
-
 if test ${GXX} = yes; then
   if test "$ac_cxxflags_set" = no; then