fix bad syntax in config.h and first step to fix chr compilation.

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2293 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

LGPL/chr/Makefile.in

@@ -11,7 +11,7 @@ srcdir=@srcdir@
 SHELL=@SHELL@
 PLBASE=@PLBASE@
 PLARCH=@PLARCH@
-PL=../../yap ../../startup
+PL=LD_LIBRARY_PATH=system YAPSHAREDIR=`pwd`/../../library ../../yap ../../startup
 XPCEBASE=$(PLBASE)/xpce
 PKGDOC=$(PLBASE)/doc/packages
 PCEHOME=../../xpce
@@ -48,9 +48,16 @@ EXAMPLES=	$(srcdir)/Benchmarks/chrfreeze.chr $(srcdir)/Benchmarks/fib.chr $(srcd
 		$(srcdir)/Benchmarks/bool.chr $(srcdir)/Benchmarks/family.chr $(srcdir)/Benchmarks/fibonacci.chr $(srcdir)/Benchmarks/leq.chr $(srcdir)/Benchmarks/listdom.chr \
 		$(srcdir)/Benchmarks/chrdif.chr
 
+GPLDIR=		$(srcdir)/../../GPL
+LGPLDIR=	$(srcdir)/../../LGPL
+EXTRALIBDIR=	$(srcdir)/../../library
+GPLLIBPL=	$(EXTRALIBDIR)/aggregate.pl $(EXTRALIBDIR)/error.pl $(EXTRALIBDIR)/occurs.yap $(EXTRALIBDIR)/pairs.pl 
+LGPLLIBPL=	$(EXTRALIBDIR)/maplist.pl
+EXTRALIBPL=	$(GPLLIBPL) $(LGPLLIBPL)
+
 all:		chr_translate.pl
 
-chr_translate_bootstrap1.pl: $(srcdir)/chr_translate_bootstrap1.chr
+chr_translate_bootstrap1.pl: $(srcdir)/chr_translate_bootstrap1.chr $(EXTRALIBPL)
 		$(PL) -f -l chr_swi_bootstrap.yap \
 		      -g "chr_compile_step1('$<','$@'),halt." \
 		      -z 'halt(1).'
@@ -85,6 +92,11 @@ chr_translate.pl: $(srcdir)/chr_translate.chr chr_translate_bootstrap2.pl guard_
 chr.pl:		chr_swi.pl
 		cp $< $@
 
+$(GPLLIBPL): $(EXTRALIBDIR)/%: $(GPLDIR)/%
+		cp $< $@
+$(LGPLLIBPL): $(EXTRALIBDIR)/%: $(LGPLDIR)/%
+		cp $< $@
+
 install:	chr_translate.pl guard_entailment.pl
 		mkdir -p $(DESTDIR)$(CHRDIR)
 		$(INSTALL) -m 644 $(LIBPL) $(DESTDIR)$(CHRDIR)

changes-5.1.html

@@ -17,6 +17,7 @@
 
 <h2>Yap-5.1.4:</h2>
 <ul>
+<li> FIXED: bad syntax in config.h (patch from Keri Harris).</li>
 <li> NEW: format over atom/1.</li>
 <li> FIXED: clean up apply_macros in swi mode.</li>
 <li> FIXED: clean up meta-expansion.</li>

config.h.in

@@ -124,10 +124,12 @@
   in adtdefs.c
 */
 #define  FFIEEE 1
-#undef   FFVAX   		/* manual */
+/*manual */
+#undef   FFVAX   
 
 /* Define the standard type of a float argument to a function */
-#define  FAFloat double		/* manual */
+/*manual */
+#define  FAFloat double	
 
 /* Set the minimum and default heap, trail and stack size */
 #undef MinTrailSpace