Changeset b20fdc in git for m4

Timestamp:

Jan 7, 2020, 12:50:30 PM (4 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0d7b0d730875bbec6a77aef58999ff69444ca348

Parents:

732205bdd491ef2c8b4d3628ab66de417fee4e24cee403c5a1f8bde4382f98b1d27e086952d5f603

Message:

Merge branch 'spielwiese' into try_out

Location:

m4

Files:

• flint-check.m4 (modified) (2 diffs)
• options.m4 (modified) (3 diffs)
• readline-check.m4 (modified) (1 diff)

m4/flint-check.m4

@@ -48 +48 @@
 for FLINT_HOME in ${FLINT_HOME_PATH}
  do
-## if test -r "$FLINT_HOME/include/flint/fmpz.h"; then
+ if test -r "$FLINT_HOME/include/flint/fmpz.h"; then
 
-        if test "x$FLINT_HOME" != "x/usr"; then
-                FLINT_CFLAGS="-I${FLINT_HOME}/include/"
-                FLINT_LIBS="-L${FLINT_HOME}/lib"
-        else
-                FLINT_CFLAGS=""
-                FLINT_LIBS=""
-        fi
+        FLINT_CFLAGS="-I${FLINT_HOME}/include/"
+        FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr"
 
         # we suppose that mpfr and mpir to be in the same place or available by default
-        FLINT_LIBS="$FLINT_LIBS -lflint -lmpfr"
-
         CFLAGS="${BACKUP_CFLAGS} ${FLINT_CFLAGS} ${GMP_CPPFLAGS}"
         LIBS="${BACKUP_LIBS} ${FLINT_LIBS} ${GMP_LIBS}"
@@ -90 +83 @@
         unset FLINT_LIBS
         ])
-#else
-#       flint_found="no"
-#fi
+else
+        flint_found="no"
+fi
 done
 AC_LANG_POP([C])

m4/options.m4

@@ -335 +335 @@
   bi_interval=false
   bi_systhreads=false
+  bi_loctriv=false
 
 
@@ -373 +374 @@
        interval ) bi_interval=true ;;
        systhreads ) bi_systhreads=true;;
+       loctriv ) bi_loctriv=true;;
       esac
 
@@ -415 +417 @@
  AM_CONDITIONAL([SI_BUILTIN_INTERVAL], [test x$bi_interval = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_SYSTHREADS], [test x$bi_systhreads = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_LOCTRIV], [test x$bi_loctriv = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_MACHINELEARNING], [test x$bi_machinelearning = xtrue])
 

m4/readline-check.m4

@@ -18 +18 @@
 AC_ARG_WITH(
   readline,
-  [  --with-readline=[dynamic,static,no]
-                        do use dynamic/static/no readline for fancy display])
+  [  --with-readline=[dynamic,static,no,ncurses]
+                        use dynamic/static/no readline/ncurses for fancy display])
 
-AC_CHECK_LIB(ncurses,tgetent,,\
- AC_CHECK_LIB(curses,tgetent,,\
-  AC_CHECK_LIB(termcap,tgetent)))
+if test "$with_readline" != no; then
+ AC_CHECK_LIB(ncurses,tgetent,,\
+  AC_CHECK_LIB(curses,tgetent,,\
+   AC_CHECK_LIB(termcap,tgetent)))
+fi
 
 # readline