xspec module: better to run code generator once at configure time

autoconf/configure.ac

@@ -246,6 +246,15 @@ JH_CREATE_FC_MODULE_ORULES(src)
 JH_APPEND_FC_RULES(src/Makefile)
 JH_APPEND_FC_ELFRULES(src/Makefile)
 
+dnl
+dnl Run xspec module code generator, but don't
+dnl assume that slsh is on the path.
+dnl
+if test "x$HEADAS_DIR" != "x" ; then
+    ( cd modules/xspec/src;
+      $SLANG_LIBDIR/../bin/slsh code_gen.sl 12 $HEADAS_DIR )
+fi
+
 echo ""
 echo "You are compiling with this compiler configuration:"
 echo "       CC =" "$CC"
@@ -263,10 +272,10 @@ if test "x$HEADAS_DIR" != "x" ; then
        headas_arg="headas"
     fi
     echo "    --with-${headas_arg} = $HEADAS_DIR"
-    ./autoconf/compiler_check.sh "$CC" "$FC" "$HEADAS_DIR"
+    autoconf/compiler_check.sh "$CC" "$FC" "$HEADAS_DIR"
 else
     echo "The XSPEC module will not be compiled."
-    ./autoconf/compiler_check.sh "$CC" "$FC"
+    autoconf/compiler_check.sh "$CC" "$FC"
 fi
     echo ""
 echo "isis will be installed in" "$prefix"

configure

@@ -11524,6 +11524,11 @@ PROGRAM_FC_ELF_ORULES="$PROGRAM_FC_ELF_ORULES
  PROGRAM_FC_ELF_ORULES=""
 
 
+if test "x$HEADAS_DIR" != "x" ; then
+    ( cd modules/xspec/src;
+      $SLANG_LIBDIR/../bin/slsh code_gen.sl 12 $HEADAS_DIR )
+fi
+
 echo ""
 echo "You are compiling with this compiler configuration:"
 echo "       CC =" "$CC"
@@ -11541,10 +11546,10 @@ if test "x$HEADAS_DIR" != "x" ; then
        headas_arg="headas"
     fi
     echo "    --with-${headas_arg} = $HEADAS_DIR"
-    ./autoconf/compiler_check.sh "$CC" "$FC" "$HEADAS_DIR"
+    autoconf/compiler_check.sh "$CC" "$FC" "$HEADAS_DIR"
 else
     echo "The XSPEC module will not be compiled."
-    ./autoconf/compiler_check.sh "$CC" "$FC"
+    autoconf/compiler_check.sh "$CC" "$FC"
 fi
     echo ""
 echo "isis will be installed in" "$prefix"

modules/xspec/src/Makefile.in

@@ -151,8 +151,8 @@ xspec_O_DEP = $(SRCDIR)/xspec-compat.inc
 #---------------------------------------------------------------------------
 # Rules
 #---------------------------------------------------------------------------
-all:  new-xspec12-code $(ELFDIR_ELF_LIB)
-static:  new-xspec12-code $(OBJDIR_NORMAL_LIB)
+all:  $(ELFDIR_ELF_LIB)
+static:  $(OBJDIR_NORMAL_LIB)
 
 $(OBJDIR_NORMAL_LIB): $(SRCDIR)/config-xspec-version $(OBJDIR) $(CONFIG_H) $(OBJS)
 	-$(RM) $(OBJDIR_NORMAL_LIB)
@@ -177,7 +177,9 @@ $(SRCDIR)/config-xspec-version:
 	HEADAS=$(HEA); export HEADAS; /bin/sh xspec_libs
 
 new-xspec11-code:
-	./code_gen.sl 11 $(HEA)/..
+	@echo '*** WARNING:  The xspec 11 interface is no longer maintained'
+	@echo '*** Use xspec 12 instead.'
+	@#./code_gen.sl 11 $(HEA)/..
 
 new-xspec12-code:
 	./code_gen.sl 12 $(HEA)/..

modules/xspec/src/parse_model_dat.sl

@@ -313,7 +313,7 @@ define find_model_dat_file (dir, xspec_version) %{{{
         variable path = path_concat (dir, x);
         if (NULL != stat_file (path))
           return path;
-        path = path_concat (dir + "/..", x);
+        path = path_concat (path_concat (dir, ".."), x);
         if (NULL != stat_file (path))
           return path;
      }