sim: added --enable-simulator to configure and bring back autogen.sh

autogen.sh

@@ -0,0 +1,111 @@
+#!/bin/sh
+#
+# Run this script to generate aclocal.m4, config.h.in, 
+# Makefile.in's, and ./configure...
+# 
+# To specify extra flags to aclocal (include dirs for example),
+# set ACLOCAL_FLAGS
+#
+
+DIE=0
+
+# minimum required versions of autoconf/automake/libtool:
+ACMAJOR=2
+ACMINOR=59
+
+AMMAJOR=1
+AMMINOR=10
+AMPATCH=2
+
+LTMAJOR=1
+LTMINOR=5
+LTPATCH=8
+
+(autoconf --version 2>&1 | \
+ perl -n0e "(/(\d+)\.(\d+)/ && \$1>=$ACMAJOR && \$2>=$ACMINOR) || exit 1") || {
+    echo
+    echo "Error: You must have 'autoconf' version $ACMAJOR.$ACMINOR or greater"
+    echo "installed to run $0. Get the latest version from"
+    echo "ftp://ftp.gnu.org/pub/gnu/autoconf/"
+    echo
+    NO_AUTOCONF=yes
+    DIE=1
+}
+
+amtest="
+    if (/(\d+)\.(\d+)((-p|\.)(\d+))*/) { 
+    exit 1 if (\$1 < $AMMAJOR || \$2 < $AMMINOR); 
+    exit 0 if (\$2 > $AMMINOR); 
+    exit 1 if (\$5 < $AMPATCH); 
+}"
+
+(automake --version 2>&1 | perl -n0e "$amtest" ) || {
+    echo
+    echo "Error: You must have 'automake' version $AMMAJOR.$AMMINOR.$AMPATCH or greater"
+    echo "installed to run $0. Get the latest version from"
+    echo "ftp://ftp.gnu.org/pub/gnu/automake/"
+    echo
+    NO_AUTOCONF=yes
+    DIE=1
+}
+
+lttest="
+    if (/(\d+)\.(\d+)((-p|\.)(\d+))*/) { 
+    exit 1 if (\$1 < $LTMAJOR);
+    exit 1 if (\$1 == $LTMAJOR && \$2 < $LTMINOR); 
+    exit 1 if (\$1 == $LTMAJOR && \$2 == $LTMINOR && \$5 < $LTPATCH);
+}"
+
+(libtool --version 2>&1 | perl -n0e "$lttest" ) || {
+    echo
+    echo "Error: You must have 'libtool' version $LTMAJOR.$LTMINOR.$LTPATCH or greater"
+    echo "installed to run $0. Get the latest version from"
+    echo "ftp://ftp.gnu.org/pub/gnu/libtool/"
+    echo
+    DIE=1
+}
+
+
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "Error: \`aclocal' appears to be missing. The installed version of"
+    echo "\`automake' may be too old. Get the most recent version from"
+    echo "ftp://ftp.gnu.org/pub/gnu/automake/"
+    NO_ACLOCAL=yes
+    DIE=1
+}
+
+if test $DIE -eq 1; then
+    exit 1
+fi
+
+# make sure that auxdir exists
+mkdir auxdir 2>/dev/null
+
+# Remove config.h.in to make sure it is rebuilt
+rm -f config.h.in
+
+set -x
+rm -fr autom4te*.cache
+${ACLOCAL:-aclocal} -I auxdir $ACLOCAL_FLAGS || exit 1
+${LIBTOOLIZE:-libtoolize} --automake --copy --force || exit 1
+${AUTOHEADER:-autoheader} || exit 1
+${AUTOMAKE:-automake} --add-missing --copy --force-missing || exit 1
+#${AUTOCONF:-autoconf} --force --warnings=all || exit 1
+${AUTOCONF:-autoconf} --force --warnings=no-obsolete || exit 1
+set +x
+
+if [ -e config.status ]; then
+   echo "removing stale config.status."
+   rm -f config.status 
+fi
+if [ -e config.log    ]; then
+   echo "removing old config.log."
+   rm -f config.log
+fi
+
+echo "now run ./configure to configure slurm for your environment."
+echo
+echo "NOTE: This script has most likely just modified files that are under"
+echo "      version control.  Make sure that you really want these changes"
+echo "      applied to the repository before you run \"git commit\"."

auxdir/x_ac_simulator.m4

@@ -0,0 +1,43 @@
+##*****************************************************************************
+#  AUTHOR:
+#    Nikolay Simakov <[email protected]>
+#
+#  SYNOPSIS:
+#    X_AC_SIMULATOR
+#
+#  DESCRIPTION:
+#    Add support for the "--enable-simulator"
+#
+#    If simulator is enabled, define SLURM_SIMULATOR in config.h ,
+#    add -DSLURM_SIMULATOR to CFLAGS and CXXFLAGS, set ENABLE_SIMULATOR
+#    for automake and add rt library to LIBS
+#    
+#
+##*****************************************************************************
+
+AC_DEFUN([X_AC_SIMULATOR], [
+  AC_MSG_CHECKING([whether or not simulator mode is enabled])
+  AC_ARG_ENABLE(
+    [simulator],
+    AS_HELP_STRING(--enable-simulator,build slurm in simulator mode),
+    [ case "$enableval" in
+        yes) x_ac_simulator=yes ;;
+         no) x_ac_simulator=no ;;
+          *) AC_MSG_RESULT([doh!])
+             AC_MSG_ERROR([bad value "$enableval" for --enable-simulator]) ;;
+      esac
+    ]
+  )
+  if test "$x_ac_simulator" = yes; then
+    test "$GCC" = yes && CFLAGS="$CFLAGS -DSLURM_SIMULATOR"
+    test "$GXX" = yes && CXXFLAGS="$CXXFLAGS -DSLURM_SIMULATOR"
+    LIBS="$LIBS -lrt -lm"
+    AC_DEFINE([SLURM_SIMULATOR],[1],
+      [Define SLURM_SIMULATOR if you are building slurm in simulator mode.]
+    )
+  fi
+  AM_CONDITIONAL([ENABLE_SIMULATOR], test "$x_ac_simulator" = "yes")
+  AC_MSG_RESULT([${x_ac_simulator=no}])
+
+  ]
+)

config.h.in

@@ -551,6 +551,9 @@
 /* Define Slurm installation prefix */
 #undef SLURM_PREFIX
 
+/* Define SLURM_SIMULATOR if you are building slurm in simulator mode. */
+#undef SLURM_SIMULATOR
+
 /* Slurm Version Number */
 #undef SLURM_VERSION_NUMBER
 

configure.ac

@@ -372,6 +372,11 @@ else
   AC_MSG_RESULT([no])
 fi
 
+dnl
+dnl Check if slurm compiled in simulation mode:
+dnl
+X_AC_SIMULATOR
+
 savedLIBS="$LIBS"
 LIBS="-lutil $LIBS"
 AC_CHECK_LIB(util, openpty, [UTIL_LIBS="-lutil"], [])