r178: *** empty log message ***

diff --git a/configure b/configure
index a3c3f2979f2b8fc6a6c8868fe39e4f31c29070b2..6ce145f550ac4e5cf1eb2c22af8e9918f816b387 100755 (executable)
--- a/configure
+++ b/configure
@@ -798,7 +798,7 @@ fi
 
 
 
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4224,6 +4224,8 @@ ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools"
 if test -n "$lamdir" ; then
   lamprograms="pjrec-lam phm2if-lam phm2pj-lam"
   
+  lamdefs="$CLFAGS"
+  
 fi
 
 CXXFLAGS="$CFLAGS"
@@ -4418,6 +4420,7 @@ s%@wxcflags@%$wxcflags%g
 s%@wxlibs@%$wxlibs%g
 s%@ctlibs@%$ctlibs%g
 s%@lamprograms@%$lamprograms%g
+s%@lamdefs@%$lamdefs%g
 
 CEOF
 EOF

diff --git a/configure.in b/configure.in
index 5d067c1f69a9183c1246583fd8a815c118789a38..3998126c80bd976e39f6d224e50b3572de4c95ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -361,7 +361,7 @@ AC_SUBST(ctlibs)
 if test -n "$lamdir" ; then
   lamprograms="pjrec-lam phm2if-lam phm2pj-lam"
   AC_SUBST(lamprograms)
-  lamdefs="$CLFAGS"
+  lamdefs="$CFLAGS"
   AC_SUBST(lamdefs)
 fi
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 24c8c691fa3f1f95db83c79c9df07b32d2a2bb61..f724e539ef2c94f184356bcca747c0eb138c1d78 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -50,13 +50,13 @@ CC_LAM = $(lamdir)/bin/balky
 LAM_EXTRA_SRC = mpiworld.cpp
 
 pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+       $(CC_LAM) @DEF@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI pjrec.cpp -o pjrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+       $(CC_LAM) @DEF@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
-       $(CC_LAM) @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
+       $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 endif