Changeset 386a86 in git
- Timestamp:
- Oct 25, 2010, 3:41:29 PM (13 years ago)
- Branches:
- (u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
- Children:
- d98d1bc543b095d8211c028e2e8eb52be1ce0ca0
- Parents:
- d4df727c506b2fe92f9e4358d97de35563a68193
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.in
rd4df72 r386a86 292 292 ${MKINSTALLDIRS} ${SI_TMPDIR}/singular-${CYGWIN_PORT_VER} 293 293 export SVN_RSH=ssh; export SVNROOT=:ext:monty.mathematik.uni-kl.de:/usr/local/Singular/svn/trunk; \ 294 cd ${SI_TMPDIR}/singular-${CYGWIN_PORT_VER}; svn co svn+ssh://monty.mathematik.uni-kl.de/usr/local/Singular/svn/trunk;294 cd ${SI_TMPDIR}/singular-${CYGWIN_PORT_VER}; svn co http://www.singular.uni-kl.de/svn/trunk; 295 295 cd ${SI_TMPDIR}; \ 296 296 tar cjf singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 singular-${CYGWIN_PORT_VER}; … … 494 494 495 495 cygwin-setup-init: 496 mkinstalldirs${CYGWIN_REP_DIR}496 ${MKINSTALLDIRS} ${CYGWIN_REP_DIR} 497 497 @echo "Writing ${CYGWIN_REP_DIR}/setup.ini" 498 498 @echo "# This file is automatically generated by Makefile." > ${CYGWIN_REP_DIR}/setup.ini -
configure
rd4df72 r386a86 594 594 SINGULAR_MAJOR_VERSION=3 595 595 SINGULAR_MINOR_VERSION=1 596 SINGULAR_SUB_VERSION= 2596 SINGULAR_SUB_VERSION=1 597 597 VERSION_SEP="-" 598 598 SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}" 599 599 SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}" 600 600 SINGULAR_RPM_VERSION="${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}" 601 VERSION_DATE=" Oct2010"601 VERSION_DATE="Feb 2010" 602 602 SINGULAR_ROOT_DIR=$pwd 603 603 … … 2282 2282 fi 2283 2283 2284 echo $ac_n "checking whether to configure and build g mplib""... $ac_c" 1>&62285 echo "configure:2286: checking whether to configure and build g mplib" >&52286 if test "$enable_g mp" != yes && test "$enable_gmp" != no; then2287 if test "$ac_gmp_ok" != yes && test -d gmp; then2284 echo $ac_n "checking whether to configure and build gfan lib""... $ac_c" 1>&6 2285 echo "configure:2286: checking whether to configure and build gfan lib" >&5 2286 if test "$enable_gfanlib" = yes; then 2287 if test -d gfanlib; then 2288 2288 echo "$ac_t""yes" 1>&6 2289 enable_gmp=yes 2290 CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp" 2291 BUILD1_SUBDIRS="$BUILD1_SUBDIRS gmp" 2292 ac_configure_args="$ac_configure_args --enable-gmp" 2293 enable_gmp=yes 2294 # This we used to need for our patched version of gmp 2.x 2295 # OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in" 2289 CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib" 2290 BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib" 2296 2291 else 2297 2292 echo "$ac_t""no" 1>&6 2298 enable_gmp=no2299 fi2300 elif test "$enable_gmp" = yes; then2301 if test ! -d gmp; then2302 echo "$ac_t""no" 1>&62303 { echo "configure: error: Can not find gmp subdir" 1>&2; exit 1; }2304 else2305 echo "$ac_t""yes" 1>&62306 CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"2307 BUILD1_SUBDIRS="$BUILD1_SUBDIRS gmp"2308 # This we used to need for our patched version of gmp 2.x2309 # OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"2310 2293 fi 2311 2294 else … … 3376 3359 esac 3377 3360 done 3378 CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib"3379 BUILDSUBDIRS1="$BUILDSUBDIRS1 gfanlib"3380 3361 3381 3362 for ac_config_dir in $CONFIG_SUBDIRS; do -
configure.in
rd4df72 r386a86 11 11 SINGULAR_MAJOR_VERSION=3 12 12 SINGULAR_MINOR_VERSION=1 13 SINGULAR_SUB_VERSION= 213 SINGULAR_SUB_VERSION=1 14 14 VERSION_SEP="-" 15 15 SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}" 16 16 SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}" 17 17 SINGULAR_RPM_VERSION="${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}" 18 VERSION_DATE=" Oct2010"18 VERSION_DATE="Feb 2010" 19 19 SINGULAR_ROOT_DIR=$pwd 20 20 … … 358 358 fi 359 359 360 AC_MSG_CHECKING(whether to configure and build gmp lib) 361 if test "$enable_gmp" != yes && test "$enable_gmp" != no; then 362 if test "$ac_gmp_ok" != yes && test -d gmp; then 363 AC_MSG_RESULT(yes) 364 enable_gmp=yes 365 CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp" 366 BUILD1_SUBDIRS="$BUILD1_SUBDIRS gmp" 367 ac_configure_args="$ac_configure_args --enable-gmp" 368 enable_gmp=yes 369 # This we used to need for our patched version of gmp 2.x 370 # OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in" 371 else 372 AC_MSG_RESULT(no) 373 enable_gmp=no 374 fi 375 elif test "$enable_gmp" = yes; then 376 if test ! -d gmp; then 377 AC_MSG_RESULT(no) 378 AC_MSG_ERROR(Can not find gmp subdir) 379 else 380 AC_MSG_RESULT(yes) 381 CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp" 382 BUILD1_SUBDIRS="$BUILD1_SUBDIRS gmp" 383 # This we used to need for our patched version of gmp 2.x 384 # OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in" 360 AC_MSG_CHECKING(whether to configure and build gfan lib) 361 if test "$enable_gfanlib" = yes; then 362 if test -d gfanlib; then 363 AC_MSG_RESULT(yes) 364 CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib" 365 BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib" 366 else 367 AC_MSG_RESULT(no) 385 368 fi 386 369 else
Note: See TracChangeset
for help on using the changeset viewer.