modernize configure
This commit modernizes the configury and ensures make dist works. Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>master
parent
2541bfea7b
commit
77590f4e50
|
@ -0,0 +1,9 @@
|
||||||
|
IOR NEWS
|
||||||
|
========
|
||||||
|
|
||||||
|
Last updated 2017-06
|
||||||
|
|
||||||
|
3.0.2
|
||||||
|
|
||||||
|
- IOR and mdtest now share a common codebase. This will make it easier
|
||||||
|
run performance benchmarks on new hardware.
|
10
bootstrap
10
bootstrap
|
@ -1,11 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
set -x
|
autoreconf -ivf
|
||||||
aclocal -I config || exit 1
|
|
||||||
#libtoolize --automake --copy --force || exit 1
|
|
||||||
autoheader || exit 1
|
|
||||||
automake --add-missing --copy --force-missing --foreign || exit 1
|
|
||||||
#autoconf --force --warnings=all || exit 1
|
|
||||||
autoconf --force || exit 1
|
|
||||||
rm -fr autom4te*.cache
|
|
||||||
exit 0
|
|
||||||
|
|
|
@ -11,6 +11,10 @@
|
||||||
# Read metadata from the META file.
|
# Read metadata from the META file.
|
||||||
##*****************************************************************************
|
##*****************************************************************************
|
||||||
|
|
||||||
|
m4_define([META_FILE], m4_include([META]))
|
||||||
|
m4_define([META_PACKAGE_NAME], regexp(META_FILE, [^Package:\s*\(.*\)], [\1]))
|
||||||
|
m4_define([META_PACKAGE_VERSION], regexp(META_FILE, [^Version:\s*\(.*\)$], [\1]))
|
||||||
|
|
||||||
AC_DEFUN([X_AC_META], [
|
AC_DEFUN([X_AC_META], [
|
||||||
AC_MSG_CHECKING([metadata])
|
AC_MSG_CHECKING([metadata])
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,12 @@
|
||||||
# Process this file with autoconf to produce a configure script.
|
# Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_PREREQ([2.62])
|
AC_PREREQ([2.62])
|
||||||
AC_INIT
|
AC_CONFIG_MACRO_DIR([config])
|
||||||
|
|
||||||
|
AC_INIT([META_PACKAGE_NAME],[META_PACKAGE_VERSION],[],[META_PACKAGE_NAME])
|
||||||
|
|
||||||
X_AC_META
|
X_AC_META
|
||||||
|
|
||||||
AC_CONFIG_AUX_DIR([config])
|
AC_CONFIG_AUX_DIR([config])
|
||||||
AC_CONFIG_SRCDIR([src/ior.c])
|
AC_CONFIG_SRCDIR([src/ior.c])
|
||||||
AC_CONFIG_HEADER([src/config.h])
|
AC_CONFIG_HEADER([src/config.h])
|
||||||
|
@ -11,7 +15,7 @@ AC_CONFIG_HEADER([src/config.h])
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
# Automake support
|
# Automake support
|
||||||
AM_INIT_AUTOMAKE([$META_NAME], [$META_VERSION], [check-news dist-bzip2 gnu no-define])
|
AM_INIT_AUTOMAKE([check-news dist-bzip2 gnu no-define])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
# Checks for programs.
|
# Checks for programs.
|
||||||
|
|
Loading…
Reference in New Issue