2014-07-30 13:04:51 +00:00
|
|
|
---
|
2014-09-08 12:38:01 +00:00
|
|
|
configure.ac | 22 +++++++++++-----------
|
|
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
2014-07-30 13:04:51 +00:00
|
|
|
|
|
|
|
Index: configure.ac
|
|
|
|
===================================================================
|
2014-09-08 12:38:01 +00:00
|
|
|
--- configure.ac.orig 2013-12-20 22:31:06.000000000 +0100
|
|
|
|
+++ configure.ac 2014-09-08 14:02:01.463998908 +0200
|
|
|
|
@@ -25,7 +25,7 @@ of the University of Illinois.
|
2014-07-30 13:04:51 +00:00
|
|
|
])
|
|
|
|
AC_CONFIG_AUX_DIR(acaux)
|
|
|
|
AC_CONFIG_MACRO_DIR(acmacros)
|
|
|
|
-AC_PROG_MAKE_SET
|
|
|
|
+AC_PROG_MAKE_SET()
|
|
|
|
|
|
|
|
|
2014-09-08 12:38:01 +00:00
|
|
|
# Obtain the command line, hostname and pwd used in "configure" for "psinv -b".
|
|
|
|
@@ -39,19 +39,19 @@ AC_DEFINE_UNQUOTED(PS_BUILD_PWD, ["$ac_p
|
|
|
|
|
2014-07-30 13:04:51 +00:00
|
|
|
# Checks for programs.
|
2014-09-08 12:38:01 +00:00
|
|
|
|
|
|
|
-AC_PROG_AWK
|
|
|
|
-AC_PROG_CC
|
|
|
|
+AC_PROG_AWK()
|
|
|
|
+AC_PROG_CC()
|
|
|
|
if test "$GCC" != "yes" -o $CC = "icc"; then
|
|
|
|
AC_MSG_FAILURE([Please use the GNU gcc compiler to build PerfSuite.
|
2014-07-30 13:04:51 +00:00
|
|
|
You may set the variable F77 to the name of a non-GNU Fortran compiler.
|
|
|
|
Please see the PerfSuite installation instructions for more information.])
|
|
|
|
fi
|
|
|
|
-AC_PROG_CPP
|
|
|
|
-AC_PROG_CXX
|
|
|
|
-AC_PROG_F77
|
|
|
|
-AC_PROG_INSTALL
|
|
|
|
-AC_PROG_LIBTOOL
|
|
|
|
-AC_PROG_LN_S
|
|
|
|
+AC_PROG_CPP()
|
|
|
|
+AC_PROG_CXX()
|
|
|
|
+AC_PROG_F77()
|
|
|
|
+AC_PROG_INSTALL()
|
|
|
|
+AC_PROG_LIBTOOL()
|
|
|
|
+AC_PROG_LN_S()
|
|
|
|
AC_PATH_PROG(XMLLINT,[xmllint])
|
|
|
|
|
|
|
|
AM_CONDITIONAL(SHAREDLIBS,test "$enable_shared" = "yes")
|
2014-09-08 12:38:01 +00:00
|
|
|
@@ -60,7 +60,7 @@ AM_CONDITIONAL(SHAREDLIBS,test "$enable_
|
2014-07-30 13:04:51 +00:00
|
|
|
|
2014-09-08 12:38:01 +00:00
|
|
|
cpuidinfo=`egrep 'family|model|stepping|MHz' /proc/cpuinfo | tail -5`
|
2014-07-30 13:04:51 +00:00
|
|
|
|
|
|
|
-AC_CANONICAL_TARGET
|
|
|
|
+AC_CANONICAL_TARGET()
|
|
|
|
|
|
|
|
case $host in
|
|
|
|
i*86-*-linux*)
|
2014-09-08 12:38:01 +00:00
|
|
|
@@ -222,7 +222,7 @@ $cpuidinfo])
|
2014-07-30 13:04:51 +00:00
|
|
|
|
|
|
|
# Initialize for Automake
|
|
|
|
|
|
|
|
-AM_INIT_AUTOMAKE([dist-bzip2])
|
|
|
|
+AM_INIT_AUTOMAKE([dist-bzip2 foreign])
|
|
|
|
AC_CONFIG_HEADERS([config.h])
|
|
|
|
|
|
|
|
|