diff --git a/config.h.in b/config.h.in
index c20f2002c3887c62e13629cfffe16bc16a5dc438..9964e62898e2361838139211dc0776fc00edfc97 100644
--- a/config.h.in
+++ b/config.h.in
@@ -323,9 +323,6 @@
/* Define to 1 if you have the <values.h> header file. */
#undef HAVE_VALUES_H
-/* Define to 1 if running on Windows system */
-#undef HAVE_WINDOWS
-
/* Define to 1 if using XCPU for job launch */
#undef HAVE_XCPU
diff --git a/configure b/configure
index e0ca036af50ec111c5991c5888782b0a43fd476d..11ba23bf0c8d9bcda7d43ef474d13267bcc58e61 100755
--- a/configure
+++ b/configure
@@ -5635,12 +5635,9 @@ $as_echo "#define USE_ALIAS 1" >>confdefs.h
;;
esac
-ac_have_windows=no
case "$host" in
*cygwin) LDFLAGS="$LDFLAGS -no-undefined"
-
-$as_echo "#define HAVE_WINDOWS 1" >>confdefs.h
-
+ PLUGIN_FLAGS="$PLUGIN_FLAGS $(top_builddir)/src/api/libslurmhelper.la"
;;
*solaris*) CC="/usr/sfw/bin/gcc"
CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -I/usr/sfw/include"
@@ -7209,13 +7206,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:7212: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7209: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7215: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7212: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7218: output\"" >&5)
+ (eval echo "\"\$as_me:7215: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8420,7 +8417,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8423 "configure"' > conftest.$ac_ext
+ echo '#line 8420 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10209,11 +10206,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:10212: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10209: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10216: \$? = $ac_status" >&5
+ echo "$as_me:10213: \$? = $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.
@@ -10548,11 +10545,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:10551: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10548: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10555: \$? = $ac_status" >&5
+ echo "$as_me:10552: \$? = $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.
@@ -10653,11 +10650,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:10656: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10653: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10660: \$? = $ac_status" >&5
+ echo "$as_me:10657: \$? = $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
@@ -10708,11 +10705,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:10711: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10708: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10715: \$? = $ac_status" >&5
+ echo "$as_me:10712: \$? = $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
@@ -13092,7 +13089,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13095 "configure"
+#line 13092 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13188,7 +13185,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13191 "configure"
+#line 13188 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15144,11 +15141,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:15147: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15144: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15151: \$? = $ac_status" >&5
+ echo "$as_me:15148: \$? = $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.
@@ -15243,11 +15240,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:15246: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15243: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15250: \$? = $ac_status" >&5
+ echo "$as_me:15247: \$? = $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
@@ -15295,11 +15292,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:15298: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15295: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15302: \$? = $ac_status" >&5
+ echo "$as_me:15299: \$? = $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
diff --git a/configure.ac b/configure.ac
index cc050e81b32eb05ef695e76934d9c87fea297821..e2fa68dfc2ab3d078ee2e84d55d5ebc2095855e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,13 +54,12 @@ case "$host" in
[Define slurm_ prefix function aliases for plugins]) ;;
esac
-ac_have_windows=no
dnl
dnl add some flags for Solaris and cygwin
dnl
case "$host" in
*cygwin) LDFLAGS="$LDFLAGS -no-undefined"
- AC_DEFINE(HAVE_WINDOWS, 1, [Define to 1 if running on Windows system])
+ PLUGIN_FLAGS="$PLUGIN_FLAGS $(top_builddir)/src/api/libslurmhelper.la"
;;
*solaris*) CC="/usr/sfw/bin/gcc"
CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -I/usr/sfw/include"