enable compiler warnings

git-svn-id: svn://tug.org/texlive/trunk@13872 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 26 insertions, 5 deletions

diff --git a/Build/source/texk/lcdf-typetools/ChangeLog.TL b/Build/source/texk/lcdf-typetools/ChangeLog.TL
new file mode 100644
index 00000000000..204108bf7c4
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/ChangeLog.TL
@@ -0,0 +1,13 @@
+ChangeLog.TL: TeX Live (TL) changes for lcdf-typetools
+======================================================
+
+2009-06-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: enable compiler warnings (TeX Live style).
+	* liblcdf/clp.c (Clp_OptionChar, finish_string_list): declare
+	as static.
+
+2009-04-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to TL2009 build system.
+
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 7f15978f774..6f2809512f7 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -92,6 +92,10 @@ versionize:
 
 .PHONY: srclinks rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42
 
+## Changes for TeX Live
+##
+EXTRA_DIST += ChangeLog.TL
+
 ## Original files from lcdf-typetools distribution
 ##
 EXTRA_DIST += Makefile.am.orig configure.ac.orig
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 194df128f69..54c3be75c95 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -306,7 +306,7 @@ EXTRA_DIST = ONEWS lcdf-typetools.spec include/lcdf/bezier.hh \
 	include/efont/t1rw.hh include/efont/t1unparser.hh \
 	include/efont/ttfcs.hh include/efont/ttfhead.hh \
 	include/efont/ttfkern.hh glyphlist.txt texglyphlist.txt 7t.enc \
-	Makefile.am.orig configure.ac.orig
+	ChangeLog.TL Makefile.am.orig configure.ac.orig
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index 96a86c2fd8f..d60025a0ba6 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -17427,7 +17427,9 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-if test -n "$GCC" ; then CC="$CC -W -Wall" ; CXX="$CXX -W -Wall" ; fi
+
+CC="$CC $WARNING_CFLAGS"
+CXX="$CXX $WARNING_CXXFLAGS"
 
 { $as_echo "$as_me:$LINENO: checking where template objects are stored" >&5
 $as_echo_n "checking where template objects are stored... " >&6; }
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index cc988adfad7..e66ac466815 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -13,7 +13,9 @@ AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CXX
 AC_PROG_CXXCPP
-if test -n "$GCC" ; then CC="$CC -W -Wall" ; CXX="$CXX -W -Wall" ; fi
+
+CC="$CC $WARNING_CFLAGS"
+CXX="$CXX $WARNING_CXXFLAGS"
 
 AC_CXX_TEMPLATE_OBJS
 
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
index 11ca85e16da..5b0d870e828 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/clp.c
+++ b/Build/source/texk/lcdf-typetools/liblcdf/clp.c
@@ -612,7 +612,7 @@ Clp_SetUTF8(Clp_Parser *clp, int utf8)
     return old_utf8;
 }
 
-int
+static int
 Clp_OptionChar(Clp_Parser *clp, int c)
 {
     Clp_Internal *cli = clp->internal;
@@ -1184,7 +1184,7 @@ parse_string_list(Clp_Parser *clp, const char *arg, int complain, void *user_dat
 }
 
 
-int
+static int
 finish_string_list(Clp_Parser *clp, int val_type, int flags,
 		   Clp_Option *items, int nitems, int itemscap)
 {