diff --git a/.gitignore b/.gitignore index 45c01a9a..23285fed 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ defs.mak Depend config.cache config.log +scripts/config.log +scripts/config.status +scripts/defs.mak *.o *.so *~ diff --git a/VERSION b/VERSION index 35faef8c..e5db82ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.12 +8.2.14 diff --git a/scripts/configure b/scripts/configure index 8119a1f0..b7e2bb24 100755 --- a/scripts/configure +++ b/scripts/configure @@ -672,6 +672,7 @@ GCORE EGREP GREP PYTHON3 +M4 RANLIB INSTALL_DATA INSTALL_SCRIPT @@ -4028,6 +4029,56 @@ else fi +for ac_prog in gm4 gnum4 m4 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_M4+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $M4 in + [\\/]* | ?:[\\/]*) + ac_cv_path_M4="$M4" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_M4="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +M4=$ac_cv_path_M4 +if test -n "$M4"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $M4" >&5 +$as_echo "$M4" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$M4" && break +done +test -n "$M4" || M4="no" + +if test x$M4 = xno; then + as_fn_error $? "M4 is required" "$LINENO" 5 +fi + # Extract the first word of "python3", so it can be a program name with args. set dummy python3; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/scripts/configure.in b/scripts/configure.in index 8568f639..e0727e4b 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -28,6 +28,12 @@ AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_RANLIB +dnl GNU M4 is preferred due to some of the option switches. +AC_PATH_PROGS([M4], [gm4 gnum4 m4], [no]) +if test x$M4 = xno; then + AC_MSG_ERROR([M4 is required]) +fi + dnl Python3 is preferred for running the preprocessor script dnl but CPP can be used instead. AC_PATH_PROG([PYTHON3], [python3], [no]) diff --git a/scripts/preproc.py b/scripts/preproc.py index 8b1cadf2..da69f352 100755 --- a/scripts/preproc.py +++ b/scripts/preproc.py @@ -1,4 +1,4 @@ -#!/ef/efabless/opengalaxy/venv/bin/python3 +#!/bin/env python3 #-------------------------------------------------------------------- # # preproc.py