Changeset 386a86 in git


Ignore:
Timestamp:
Oct 25, 2010, 3:41:29 PM (14 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
d98d1bc543b095d8211c028e2e8eb52be1ce0ca0
Parents:
d4df727c506b2fe92f9e4358d97de35563a68193
Message:
changing build system for gfan lib

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

Legend:

Unmodified
Added
Removed
  • Makefile.in

    rd4df72 r386a86  
    292292        ${MKINSTALLDIRS} ${SI_TMPDIR}/singular-${CYGWIN_PORT_VER}
    293293        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;
    295295        cd  ${SI_TMPDIR}; \
    296296        tar cjf singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 singular-${CYGWIN_PORT_VER};
     
    494494
    495495cygwin-setup-init:
    496         mkinstalldirs ${CYGWIN_REP_DIR}
     496        ${MKINSTALLDIRS} ${CYGWIN_REP_DIR}
    497497        @echo "Writing ${CYGWIN_REP_DIR}/setup.ini"
    498498        @echo "# This file is automatically generated by Makefile." > ${CYGWIN_REP_DIR}/setup.ini
  • configure

    rd4df72 r386a86  
    594594SINGULAR_MAJOR_VERSION=3
    595595SINGULAR_MINOR_VERSION=1
    596 SINGULAR_SUB_VERSION=2
     596SINGULAR_SUB_VERSION=1
    597597VERSION_SEP="-"
    598598SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}"
    599599SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}"
    600600SINGULAR_RPM_VERSION="${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}"
    601 VERSION_DATE="Oct 2010"
     601VERSION_DATE="Feb 2010"
    602602SINGULAR_ROOT_DIR=$pwd
    603603
     
    22822282fi
    22832283
    2284 echo $ac_n "checking whether to configure and build gmp lib""... $ac_c" 1>&6
    2285 echo "configure:2286: checking whether to configure and build gmp lib" >&5
    2286 if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
    2287   if test "$ac_gmp_ok" != yes && test -d gmp; then
     2284echo $ac_n "checking whether to configure and build gfan lib""... $ac_c" 1>&6
     2285echo "configure:2286: checking whether to configure and build gfan lib" >&5
     2286if test "$enable_gfanlib" = yes; then
     2287  if test -d gfanlib; then
    22882288    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"
    22962291  else
    22972292    echo "$ac_t""no" 1>&6
    2298     enable_gmp=no
    2299   fi
    2300 elif test "$enable_gmp" = yes; then
    2301   if test ! -d gmp; then
    2302     echo "$ac_t""no" 1>&6
    2303     { echo "configure: error: Can not find gmp subdir" 1>&2; exit 1; }
    2304   else
    2305     echo "$ac_t""yes" 1>&6
    2306     CONFIG_SUBDIRS="$CONFIG_SUBDIRS gmp"
    2307     BUILD1_SUBDIRS="$BUILD1_SUBDIRS gmp"
    2308 #    This we used to need for our patched version of gmp 2.x
    2309 #    OUTPUT_MAKEFILES="$OUTPUT_MAKEFILES gmp/Makefile.in"
    23102293  fi
    23112294else
     
    33763359    esac
    33773360  done
    3378   CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib"
    3379   BUILDSUBDIRS1="$BUILDSUBDIRS1 gfanlib"
    33803361
    33813362  for ac_config_dir in $CONFIG_SUBDIRS; do
  • configure.in

    rd4df72 r386a86  
    1111SINGULAR_MAJOR_VERSION=3
    1212SINGULAR_MINOR_VERSION=1
    13 SINGULAR_SUB_VERSION=2
     13SINGULAR_SUB_VERSION=1
    1414VERSION_SEP="-"
    1515SINGULAR_SHORT_VERSION="${SINGULAR_MAJOR_VERSION}${VERSION_SEP}${SINGULAR_MINOR_VERSION}"
    1616SINGULAR_VERSION="${SINGULAR_SHORT_VERSION}${VERSION_SEP}${SINGULAR_SUB_VERSION}"
    1717SINGULAR_RPM_VERSION="${SINGULAR_MAJOR_VERSION}.${SINGULAR_MINOR_VERSION}.${SINGULAR_SUB_VERSION}"
    18 VERSION_DATE="Oct 2010"
     18VERSION_DATE="Feb 2010"
    1919SINGULAR_ROOT_DIR=$pwd
    2020
     
    358358fi
    359359
    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"
     360AC_MSG_CHECKING(whether to configure and build gfan lib)
     361if 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)
    385368  fi
    386369else
Note: See TracChangeset for help on using the changeset viewer.