diff --git a/config.h.in b/config.h.in
index 52b8b9ec5af21a9fc9ba7feebb22f8c75f08216d..8e4959651c4019545235610cb4ee6e8702ed2947 100644
--- a/config.h.in
+++ b/config.h.in
@@ -63,9 +63,6 @@
/* Define to 1 for basic support of Cray XT/XE systems */
#undef HAVE_CRAY
-/* Define to 1 for native Cray XT/XE system */
-#undef HAVE_NATIVE_CRAY
-
/* Define to 1 if you have the <curses.h> header file. */
#undef HAVE_CURSES_H
@@ -161,6 +158,9 @@
/* Define to 1 if using MySQL libaries */
#undef HAVE_MYSQL
+/* Define to 1 for native Cray XT/XE system */
+#undef HAVE_NATIVE_CRAY
+
/* Define to 1 if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H
diff --git a/configure b/configure
index 2c857b41dff85d5bbd11e62b07d24d49453210e1..33535e8fa36155020c4e1969f612924aab6fec82 100755
--- a/configure
+++ b/configure
@@ -1004,7 +1004,6 @@ with_pam_dir
enable_iso8601
enable_load_env_no_login
enable_cray_xt
-with_apbasil
enable_sun_const
with_dimensions
with_hwloc
@@ -1709,7 +1708,6 @@ Optional Packages:
--with-cpusetdir=PATH specify path to cpuset directory default is
/dev/cpuset
--with-pam_dir=PATH Specify path to PAM module installation
- --with-apbasil=PATH Specify path to apbasil command
--with-dimensions=N set system dimension count for generic computer
system
--with-hwloc=PATH Specify path to hwloc installation
@@ -7219,13 +7217,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7222: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7220: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7225: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7223: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7228: output\"" >&5)
+ (eval echo "\"\$as_me:7226: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8430,7 +8428,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8433 "configure"' > conftest.$ac_ext
+ echo '#line 8431 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10219,11 +10217,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10222: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10220: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10226: \$? = $ac_status" >&5
+ echo "$as_me:10224: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10558,11 +10556,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10561: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10559: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10565: \$? = $ac_status" >&5
+ echo "$as_me:10563: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10663,11 +10661,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10666: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10670: \$? = $ac_status" >&5
+ echo "$as_me:10668: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10718,11 +10716,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10721: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10719: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10725: \$? = $ac_status" >&5
+ echo "$as_me:10723: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13102,7 +13100,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13105 "configure"
+#line 13103 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13198,7 +13196,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13201 "configure"
+#line 13199 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15154,11 +15152,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15157: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15155: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15161: \$? = $ac_status" >&5
+ echo "$as_me:15159: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15253,11 +15251,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15256: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15254: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15260: \$? = $ac_status" >&5
+ echo "$as_me:15258: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15305,11 +15303,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15308: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15306: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15312: \$? = $ac_status" >&5
+ echo "$as_me:15310: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18151,8 +18149,8 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
LIBS="$PTHREAD_LIBS $LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cray XT" >&5
-$as_echo_n "checking for Cray XT... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether this is a native Cray XT or XE system" >&5
+$as_echo_n "checking whether this is a native Cray XT or XE system... " >&6; }
# Check whether --enable-cray-xt was given.
if test "${enable_cray_xt+set}" = set; then :
enableval=$enable_cray_xt; case "$enableval" in
@@ -18170,46 +18168,38 @@ fi
if test "$x_ac_cray_xt" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-$as_echo "#define HAVE_3D 1" >>confdefs.h
+$as_echo "#define HAVE_CRAY 1" >>confdefs.h
+ # Check whether we are on a native Cray host:
+ # * older XT systems use an /etc/xtrelease file
+ # * newer XT/XE systems use an /etc/opt/cray/release/xtrelease file
+ # * both have an /etc/xthostname
+ if test -f /etc/xtrelease || test -d /etc/opt/cray/release ; then
-$as_echo "#define SYSTEM_DIMENSIONS 3" >>confdefs.h
+$as_echo "#define HAVE_NATIVE_CRAY 1" >>confdefs.h
-$as_echo "#define HAVE_CRAY 1" >>confdefs.h
+$as_echo "#define HAVE_3D 1" >>confdefs.h
+
+
+$as_echo "#define SYSTEM_DIMENSIONS 3" >>confdefs.h
$as_echo "#define HAVE_FRONT_END 1" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-# Check whether --with-apbasil was given.
-if test "${with_apbasil+set}" = set; then :
- withval=$with_apbasil; try_apbasil=$withval
-fi
-
- apbasil_default_locs="/usr/bin/apbasil"
- for apbasil_loc in $try_apbasil "" $apbasil_default_locs; do
- if test -z "$have_apbasil" -a -x "$apbasil_loc" ; then
- have_apbasil=$apbasil_loc
- fi
- done
- if test ! -z "$have_apbasil" ; then
-
-cat >>confdefs.h <<_ACEOF
-#define APBASIL_LOC "$have_apbasil"
-_ACEOF
-
- fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sun Constellation system" >&5
$as_echo_n "checking for Sun Constellation system... " >&6; }
# Check whether --enable-sun-const was given.