--- rpl/src/Makefile.am	2010/03/17 14:14:36	1.10
+++ rpl/src/Makefile.am	2010/03/29 07:57:43	1.13
@@ -18,13 +18,13 @@ ldadd_libssl = $(top_builddir)/tools/@OP
 include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include
 
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
-include_libsqlite = -I$(top_builddir)/tools/@SQLITE@
+include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
 date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
-		awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
+		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\"" \
 		-Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \
-		awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
+		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\""
 
 hash := -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
@@ -243,35 +243,35 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c)
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
-			awk -F= '{print $$2;}'` \
+			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.h: %.h
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
-			awk -F= '{print $$2;}'` \
+			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.f: %.f
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
-			awk -F= '{print $$2;}'` \
+			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.F90: %.F90
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
-			awk -F= '{print $$2;}'` \
+			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.inc: %.inc
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
-			awk -F= '{print $$2;}'` \
+			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 licences:
@@ -282,12 +282,12 @@ licences:
 	echo "#   define INCLUSION_LICENCE" >> $(srcdir)/licence.h
 	echo "    unsigned char CeCILL_fr[] =" >> $(srcdir)/licence.h
 	sed -e '1,$$s/"/\\"/g' $(srcdir)/../Licence_CeCILL_V2-fr.txt | \
-			awk -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \
+			$(AWK) -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \
 			>> $(srcdir)/licence.h
 	echo "    ;" >> $(srcdir)/licence.h
 	echo "    unsigned char CeCILL_en[] =" >> $(srcdir)/licence.h
 	sed -e '1,$$s/"/\\"/g' $(srcdir)/../Licence_CeCILL_V2-en.txt | \
-			awk -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \
+			$(AWK) -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \
 			>> $(srcdir)/licence.h
 	echo "    ;" >> $(srcdir)/licence.h
 	echo "#endif" >> $(srcdir)/licence.h
@@ -298,53 +298,53 @@ licences:
 		cat $(srcdir)/../COPYING > $(srcdir)/tmp; \
 		echo >> $(srcdir)/tmp; \
 		echo >> $(srcdir)/tmp; \
-		awk -F'\n' 'BEGIN {d=0;} /^#/ {d=1;} {if(d==1) print $$1;}' \
+		$(AWK) -F'\n' 'BEGIN {d=0;} /^#/ {d=1;} {if(d==1) print $$1;}' \
 				$(srcdir)/$$i >> $(srcdir)/tmp; \
 		mv -f $(srcdir)/tmp $(srcdir)/$$i; \
 	done
 	for i in $(SRCINC); \
 	do \
-		iconv -f `file -i $(srcdir)/../COPYING | awk -F= '{print $$2;}'` \
+		iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \
 				$(srcdir)/../COPYING | \
-				awk -F'\n' '! (/^\/\*/ || /^\*\//) \
+				$(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \
 				{printf("!%s\n", substr($$1,2));}' | \
 				iconv -t `file -i $(srcdir)/../COPYING | \
-				awk -F= '{print $$2;}'` > $(srcdir)/tmp; \
-		awk -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \
+				$(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \
+		$(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \
 				$(srcdir)/$$i >> $(srcdir)/tmp; \
 		mv -f $(srcdir)/tmp $(srcdir)/$$i; \
 	done
 	for i in $(SRCF); \
 	do \
-		iconv -f `file -i $(srcdir)/../COPYING | awk -F= '{print $$2;}'` \
+		iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \
 				$(srcdir)/../COPYING | \
-				awk -F'\n' '! (/^\/\*/ || /^\*\//) \
+				$(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \
 				{printf("C%s\n", substr($$1,2));}' | \
 				iconv -t `file -i $(srcdir)/../COPYING | \
-				awk -F= '{print $$2;}'` > $(srcdir)/tmp; \
-		awk -F'\n' 'BEGIN {d=0;} ! /^C/ {d=1;} {if(d==1) print $$1;}' \
+				$(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \
+		$(AWK) -F'\n' 'BEGIN {d=0;} ! /^C/ {d=1;} {if(d==1) print $$1;}' \
 				$(srcdir)/$$i >> $(srcdir)/tmp; \
 		mv -f $(srcdir)/tmp $(srcdir)/$$i; \
 	done
 	for i in $(SRCF90); \
 	do \
-		iconv -f `file -i $(srcdir)/../COPYING | awk -F= '{print $$2;}'` \
+		iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \
 				$(srcdir)/../COPYING | \
-				awk -F'\n' '! (/^\/\*/ || /^\*\//) \
+				$(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \
 				{printf("!%s\n", substr($$1,2));}' | \
 				iconv -t `file -i $(srcdir)/../COPYING | \
-				awk -F= '{print $$2;}'` > $(srcdir)/tmp; \
-		awk -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \
+				$(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \
+		$(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \
 				$(srcdir)/$$i >> $(srcdir)/tmp; \
 		mv -f $(srcdir)/tmp $(srcdir)/$$i; \
 	done
 
 librplprototypes.h: rpl.h conversion.awk
-	awk -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \
+	$(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \
 			$(top_builddir)/src/librplprototypes.h
 
 generateurs.c: generateurs_aleatoires.awk
-	awk -f $(srcdir)/generateurs_aleatoires.awk \
+	$(AWK) -f $(srcdir)/generateurs_aleatoires.awk \
 			$(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \
 			$(top_builddir)/src/generateurs.c
 
@@ -383,7 +383,7 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 #rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) --export-dynamic
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,--export-dynamic
 
 rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
 			 -Wno-pointer-sign -Wno-unused-parameter
@@ -408,7 +408,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
-		-Dd_locale=\"$(shell locale charmap)\" \
+		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
 rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \