Description: upstream -- autotoolization -- refreshment Attempt to refresh and rationalize further the autotools machinery with respect to linux custom; meant to be submitted to the upstream maintainer team. Origin: debian Forwarded: no-more-maintained-by-upstream Author: Jerome Benoit Last-Update: 2015-05-18 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + INCLUDES = -I${top_builddir} SUBDIRS = . include mylib probdist testu01 examples doc param --- a/configure.ac +++ b/configure.ac @@ -1,33 +1,43 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -# AC_PREREQ(2.57) -AC_INIT(TestU01, 1.2.3, lecuyer@iro.umontreal.ca) +# AC_PREREQ(2.69) +AC_INIT([TestU01],[1.2.3], + [lecuyer@iro.umontreal.ca],[testu01], + [http://simul.iro.umontreal.ca/testu01/tu01.html]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([mylib/num.c]) -AM_INIT_AUTOMAKE -AC_CONFIG_HEADER([include/config.h]) -AC_CONFIG_HEADER([include/gdefconf.h]) +AC_CONFIG_HEADERS([include/gdefconf.h]) +AC_USE_SYSTEM_EXTENSIONS +AM_INIT_AUTOMAKE([foreign]) +AM_SILENT_RULES([no]) +AM_MAINTAINER_MODE([]) +# Check for which system. AC_CANONICAL_HOST # Checks for programs. -AC_PROG_CC AC_PROG_CPP +AC_PROG_CC +AC_PROG_CC_C99 AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_PROG_LIBTOOL -AC_CHECK_PROG(have_mathematica,math, yes, no) +LT_INIT + +AC_CHECK_PROG(have_mathematica,math, yes, no) if test "x$have_mathematica" = "xyes" ; then AC_DEFINE([HAVE_MATHEMATICA], 1, [Define when Mathematica is installed]) fi # Checks for libraries. -AC_CHECK_LIBM +LT_LIB_M +AM_PATH_GMP([5],[AC_DEFINE([HAVE_GMP_H],[1],[Define to 1 if the GNU Multi-Precision library in installed])]) # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([sys/utsname.h unistd.h windows.h gmp.h stdint.h]) +AC_CHECK_HEADERS([sys/utsname.h unistd.h windows.h stdint.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -38,11 +48,12 @@ # Checks for library functions. # AC_FUNC_MALLOC # AC_FUNC_REALLOC +OLD_LIBS="$LIBS" LIBS="$LIBM $LIBS" AC_CHECK_FUNCS([random erf lgamma log1p]) +LIBS="$OLD_LIBS" AC_CONFIG_FILES([Makefile include/Makefile mylib/Makefile probdist/Makefile testu01/Makefile examples/Makefile doc/Makefile param/Makefile]) -AC_SUBST([LIBM]) AC_OUTPUT --- /dev/null +++ b/m4/adhoc_gmp.m4 @@ -0,0 +1,282 @@ +# adhoc_gmp.m4 serial 2 +dnl m4/adhoc_gmp.m4 -- M4 macro processor include script +dnl +dnl Copyright (C) 2015 Jerome Benoit +dnl +dnl Based on macros by Owen Taylor, modified by: +dnl Hans Petter Jansson, 2001-04-09; +dnl Allin Cottrell, April 2003; +dnl and certainly others. +dnl +dnl Copying and distribution of this file, with or without modification, are +dnl permitted in any medium without royalty provided the copyright notice and +dnl this notice are preserved. This file is offered as-is, without any warranty. +dnl +dnl +dnl NOTE: +dnl m4/adhoc_gmp.m4 is a digest version of m4/mpria_ax_prog_path_gmp_cc.m4 +dnl written and copyrighted by the same author Jerome Benoit for the +dnl GNU MPRIA project . +dnl + +dnl _adhoc_AC_PROG_PATH_GMP_CC_ARG_WITH +AC_DEFUN_ONCE([_adhoc_AC_PROG_PATH_GMP_CC_ARG_WITH],[dnl +AC_ARG_WITH([gmp-prefix], + [AS_HELP_STRING([--with-gmp-prefix=PREFIX], + [specify prefix for the installed GMP [standard search prefixes]])], + [gmp_config_prefix="$withval"],[gmp_config_prefix=""]) +AC_ARG_WITH([gmp-include], + [AS_HELP_STRING([--with-gmp-include=PATH], + [specify directory for the installed GMP header file [standard search paths]])], + [gmp_config_include_prefix="$withval"],[gmp_config_include_prefix=""]) +AC_ARG_WITH([gmp-lib], + [AS_HELP_STRING([--with-gmp-lib=PATH], + [specify directory for the installed GMP library [standard search paths]])], + [gmp_config_lib_prefix="$withval"],[gmp_config_lib_prefix=""]) + + if test "x$gmp_config_include_prefix" = "x" ; then + if test "x$gmp_config_prefix" != "x" ; then + gmp_config_include_prefix="$gmp_config_prefix/include" + fi + fi + if test "x$gmp_config_lib_prefix" = "x" ; then + if test "x$gmp_config_prefix" != "x" ; then + gmp_config_lib_prefix="$gmp_config_prefix/lib" + fi + fi + + GMP_CPPFLAGS= + if test "x$gmp_config_include_prefix" != "x" ; then + GMP_CPPFLAGS="-I$gmp_config_include_prefix" + fi + + GMP_LDFLAGS= + if test "x$gmp_config_lib_prefix" != "x" ; then + GMP_LDFLAGS="-L$gmp_config_lib_prefix" + fi + +AC_SUBST(GMP_CPPFLAGS) +AC_SUBST(GMP_LDFLAGS) +]) + +dnl adhoc_AM_PATH_GMP([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +AC_DEFUN([adhoc_AM_PATH_GMP],[dnl +AC_REQUIRE([AC_PROG_SED])dnl +AC_REQUIRE([_adhoc_AC_PROG_PATH_GMP_CC_ARG_WITH])dnl + + min_gmp_version=m4_default([$1],[4.1.0]) + min_gmp_version_0_0_0="$min_gmp_version.0.0.0" + + min_gmp_version_major=`echo $min_gmp_version_0_0_0 | \ + $SED 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)\(.*\)/\1/'` + min_gmp_version_minor=`echo $min_gmp_version_0_0_0 | \ + $SED 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)\(.*\)/\2/'` + min_gmp_version_micro=`echo $min_gmp_version_0_0_0 | \ + $SED 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)\(.*\)/\3/'` + + min_gmp_dotted_version="$min_gmp_version_major.$min_gmp_version_minor.$min_gmp_version_micro" + + GMP_LIBS="-lgmp" + + AC_MSG_CHECKING([for GMP - version >= $min_gmp_version ]) + + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_CFLAGS="$CFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + ac_save_LIBS="$LIBS" + + CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS" + CFLAGS="$CFLAGS $GMP_CFLAGS" + LDFLAGS="$LDFLAGS $GMP_LDFLAGS" + LIBS="$LIBS $GMP_LIBS" + + rm -f conf.gmptest + AC_RUN_IFELSE([AC_LANG_SOURCE( +[[ +#include +#include +#include +#include + +#define PRINTF_MSG_ERROR_MISMATCH_HEADER_LIBRARY \ + printf("*** This likely indicates either a bad configuration or some\n"); \ + printf("*** other inconsistency in the development environment. If the\n"); \ + printf("*** expected GNU MP library cannot be found, it may be sufficient\n"); \ + printf("*** either to set properly the LD_LIBRARY_PATH environment variable\n"); \ + printf("*** or to configure ldconfig(8) to consider the installed location.\n"); \ + printf("*** Otherwise a bad configuration or an inconsistency in the\n"); \ + printf("*** include/library search paths may be investigated; adjustments\n"); \ + printf("*** through the use of --with-gmp-(include|lib) configure option\n"); \ + printf("*** may help.\n"); \ + printf("***\n"); \ + printf("*** If an old version is installed, it may be best to remove it and to\n"); \ + printf("*** reinstall a more recent one; although modifying LD_LIBRARY_PATH\n"); \ + printf("*** may also get things to work. The latest version of GNU MP is always\n"); \ + printf("*** available from http://gmplib.org/.\n"); \ + printf("***\n"); + +int main () +{ + int gmp_hdr_version_major = 0; + int gmp_hdr_version_minor = 0; + int gmp_hdr_version_micro = 0; + int gmp_lib_version_major = 0; + int gmp_lib_version_minor = 0; + int gmp_lib_version_micro = 0; + char *tmp_version_0; + char *tmp_version_1; + mpz_t a; + mpz_t b; + mpz_t c; + + mpz_init (a); + mpz_init (b); + mpz_init (c); + mpz_mul (c, a, b); + + fclose (fopen ("conf.gmptest", "w")); + +#ifdef __GMP_CC +#define GMPM4_CC __GMP_CC +#else +#define GMPM4_CC "" +#endif + +#ifdef __GMP_CFLAGS +#define GMPM4_CFLAGS __GMP_CFLAGS +#else +#define GMPM4_CFLAGS "" +#endif + +#ifdef __GNU_MP_VERSION + gmp_hdr_version_major = __GNU_MP_VERSION; +#endif + +#ifdef __GNU_MP_VERSION_MINOR + gmp_hdr_version_minor = __GNU_MP_VERSION_MINOR; +#endif + +#ifdef __GNU_MP_VERSION_PATCHLEVEL + gmp_hdr_version_micro = __GNU_MP_VERSION_PATCHLEVEL; +#endif + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version_0 = strdup(gmp_version); + tmp_version_1 = strdup(gmp_version); + if (sscanf(tmp_version_0, "%d.%d.%d", + &gmp_lib_version_major, &gmp_lib_version_minor, &gmp_lib_version_micro) != 3) { + gmp_lib_version_micro = 0; + if (sscanf(tmp_version_1, "%d.%d", + &gmp_lib_version_major, &gmp_lib_version_minor) != 2) { + printf("\n***\n"); + printf("*** unexpected GMP library version string\n"); + printf("***\n"); + exit(1); + } + } + + if ( + (gmp_lib_version_major != gmp_hdr_version_major) || + (gmp_lib_version_minor != gmp_hdr_version_minor) || + (gmp_lib_version_micro != gmp_hdr_version_micro) + ) { + printf("\n***\n"); + printf("*** GNU MP header version numbers (%d.%d.%d) and\n", + gmp_hdr_version_major, gmp_hdr_version_minor, gmp_hdr_version_micro); + printf("*** GNU MP library version numbers (%d.%d.%d)\n", + gmp_lib_version_major, gmp_lib_version_minor, gmp_lib_version_micro); + printf("*** do not match.\n"); + printf("***\n"); + PRINTF_MSG_ERROR_MISMATCH_HEADER_LIBRARY + } + else if ( + ($min_gmp_version_major < gmp_hdr_version_major) || + ( + ($min_gmp_version_major == gmp_hdr_version_major) && + ($min_gmp_version_minor < gmp_hdr_version_minor) + ) || + ( + ($min_gmp_version_major == gmp_hdr_version_major) && + ($min_gmp_version_minor == gmp_hdr_version_minor) && + ($min_gmp_version_micro <= gmp_hdr_version_micro) + ) + ) { + return (0); + } + else { + printf("\n***\n"); + printf("*** GNU MP version $min_gmp_dotted_version or higher is required:\n"); + printf("*** an older version of GNU MP (%d.%d.%d) was found.\n", + gmp_hdr_version_major, gmp_hdr_version_minor, gmp_hdr_version_micro); + printf("*** The latest version of GNU MP is always available from http://gmplib.org/.\n"); + printf("***\n"); + } + + return (1); +} +]] +)],[],[no_gmp=yes],[AC_MSG_WARN([$ac_n "cross compiling; assumed OK... $ac_c])]) + + CPPFLAGS="$ac_save_CPPFLAGS" + CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" + + if test "x$no_gmp" = "x" ; then + AC_MSG_RESULT([yes]) + $2 + else + AC_MSG_RESULT([no]) + if test -f conf.gmptest ; then + : + else + echo "***" + echo "*** Could not run GNU MP test program, checking why..." + CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS" + CFLAGS="$CFLAGS $GMP_CFLAGS" + LDFLAGS="$CFLAGS $GMP_LDFLAGS" + LIBS="$LIBS $GMP_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[ +#include +#include +]], +[[ return (1); ]] +)], +[ +echo "***" +echo "*** The test program compiled, but did not run. This usually means" +echo "*** that the run-time linker is not finding GNU MP or finding the wrong" +echo "*** version of GNU MP. If it is not finding GNU MP, you'll need to set your" +echo "*** LD_LIBRARY_PATH environment variable, or configure ldconfig(8) to consider" +echo "*** the installed location." +echo "***" +echo "*** If you have an old version installed, it is best to remove it; although" +echo "*** modifying LD_LIBRARY_PATH may also get things to work. The latest version" +echo "*** of GNU MP is always available from http://gmplib.org/." +echo "***" +], +[ +echo "***" +echo "*** The test program failed to compile or link. See the file config.log for the" +echo "*** exact error that occured. This usually means GNU MP was incorrectly installed" +echo "*** or that you have moved GNU MP since it was installed." +echo "***" +]) + CPPFLAGS="$ac_save_CPPFLAGS" + CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" + fi + rm -f conf.gmptest + m4_default([$3],[AC_MSG_ERROR([no suitable GNU MP library found])]) + fi + rm -f conf.gmptest + +AC_SUBST(GMP_LIBS) +]) + +dnl alias +AU_ALIAS([AM_PATH_GMP],[adhoc_AM_PATH_GMP]) + +dnl eof --- a/mylib/gdef.tex +++ b/mylib/gdef.tex @@ -149,7 +149,7 @@ \code -#undef USE_GMP +/* #undef USE_GMP */ \endcode \tab Define this macro if the GNU multi-precision package GMP is available. GMP is a portable library written in C for arbitrary --- a/testu01/Makefile.am +++ b/testu01/Makefile.am @@ -4,9 +4,9 @@ lib_LTLIBRARIES = libtestu01.la libtestu01_la_SOURCES = $(TESTU01SOURCES) -libtestu01_la_LIBADD = $(top_builddir)/probdist/libprobdist.la $(top_builddir)/mylib/libmylib.la +libtestu01_la_LIBADD = $(top_builddir)/probdist/libprobdist.la $(top_builddir)/mylib/libmylib.la $(GMP_LIBS) $(LIBM) libtestu01_la_LDFLAGS = -no-undefined -version-info 0:1:0 EXTRA_DIST = guidetestu01.tex intro.tex title.tex scatfig.tex bintro.tex copyright.tex fintro.tex sintro.tex uintro.tex guidetestu01.bbl -doc_DATA = guideshorttestu01.pdf guidelongtestu01.pdf +doc_PDF = guideshorttestu01.pdf guidelongtestu01.pdf --- a/testu01/bbattery.c +++ b/testu01/bbattery.c @@ -29,7 +29,7 @@ \*************************************************************************/ #include "util.h" -#include "config.h" +#include "gdefconf.h" #include "bbattery.h" #include "smultin.h" #include "sknuth.h" --- a/mylib/chrono.c +++ b/mylib/chrono.c @@ -29,7 +29,7 @@ \*************************************************************************/ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "gdefconf.h" #endif #include "chrono.h" --- a/mylib/gdef.c +++ b/mylib/gdef.c @@ -29,7 +29,7 @@ \*************************************************************************/ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "gdefconf.h" #endif #include "gdef.h" --- a/mylib/Makefile.am +++ b/mylib/Makefile.am @@ -2,9 +2,9 @@ lib_LTLIBRARIES = libmylib.la libmylib_la_SOURCES = $(MYLIBSOURCES) -libmylib_la_LIBADD = @LIBM@ +libmylib_la_LIBADD = $(LIBM) libmylib_la_LDFLAGS = -no-undefined -version-info 0:1:0 EXTRA_DIST = guidemylib.tex tcode.tex titre.tex guidemylib.bbl -doc_DATA = guidemylib.pdf +doc_PDF = guidemylib.pdf --- a/probdist/Makefile.am +++ b/probdist/Makefile.am @@ -2,9 +2,9 @@ lib_LTLIBRARIES = libprobdist.la libprobdist_la_SOURCES = $(PROBDISTSOURCES) -libprobdist_la_LIBADD = $(top_builddir)/mylib/libmylib.la +libprobdist_la_LIBADD = $(top_builddir)/mylib/libmylib.la $(LIBM) libprobdist_la_LDFLAGS = -no-undefined -version-info 0:1:0 EXTRA_DIST = guideprobdist.tex titre.tex copyright.tex guideprobdist.bbl -doc_DATA = guideprobdist.pdf +doc_PDF = guideprobdist.pdf --- a/include/makedef +++ b/include/makedef @@ -2,7 +2,7 @@ rm -f Makefile.def -echo 'docdir = ${prefix}/share/TestU01/doc' >> Makefile.def +##echo 'docdir = ${prefix}/share/TestU01/doc' >> Makefile.def echo 'MYLIB = ${top_srcdir}/mylib' >> Makefile.def echo 'PROBDIST = ${top_srcdir}/probdist' >> Makefile.def echo 'TESTU01 = ${top_srcdir}/testu01' >> Makefile.def --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,11 +1,11 @@ %.h: ${MYLIB}/%.tex - ${top_srcdir}/tcode $< $@ + ${top_builddir}/tcode $< $@ %.h: ${PROBDIST}/%.tex - ${top_srcdir}/tcode $< $@ + ${top_builddir}/tcode $< $@ %.h: ${TESTU01}/%.tex - ${top_srcdir}/tcode $< $@ + ${top_builddir}/tcode $< $@ include Makefile.def --- a/param/Makefile.am +++ b/param/Makefile.am @@ -1,4 +1,4 @@ -pardir = ${prefix}/share/TestU01/param +pardir = ${pkgdatadir}/param par_DATA = CombCubLCG.par InvExpl.par InvImpl2b.par LCGWu2.par \ CombCubic2.par InvExpl2a.par LCGBad2.par LFSR1.par TausLCG2.par \ --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ -exdir = ${prefix}/share/TestU01/examples +examplesdir = $(docdir)/examples -ex_DATA = bat1.res bat2.res birth1.res ex3.res excel.dat vax.bin my16807.h \ +examples_DATA = bat1.res bat2.res birth1.res ex3.res excel.dat vax.bin my16807.h \ bat1.c bat2.c bat3.c birth1.c birth2.c ex1.c ex3.c ex4.c ex7.c \ fcoll.c fbirth.c scat.c scat2.c my16807.c mrg32k3a.c xorshift.c \ - fbirth.res1.tex fbirth.res2.tex fcoll.res1.tex fcoll.res2.tex + fbirth.res1.tex fbirth.res2.tex fcoll.res1.tex fcoll.res2.tex