More optimisation and cleanup for the PNG lib handling in configure.in. Also reordered the variables the same way in the main if test code so that differences now are obvious between the two modes

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6515 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

configure.in

@@ -595,23 +595,18 @@ if test x$enable_localpng != xyes ; then
 	syspnginc_ok=yes)
     if test x$syspnginc_ok = xyes; then
 	syspnglib_ok=yes
-    else
-	syspnglib_ok=no
     fi])
 fi
-#AC_MSG_WARN("*** USING LIB OK : $syspnglib_ok")
 
 # The following is executed if the lib was not found usable or if local lib is required explicitly
 if test x$enable_localpng = xyes -o x$syspnglib_ok = xno ; then
-#    ac_cv_lib_png_png_set_tRNS_to_alpha=yes
+    PNGINC="-I../png"
+    PNG="png"
+    IMAGELIBS="-lfltk_png $IMAGELIBS"
     AC_DEFINE(HAVE_LIBPNG)
     AC_DEFINE(HAVE_PNG_H)
     AC_DEFINE(HAVE_PNG_GET_VALID)
     AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA)
-    PNGINC="-I../png"
-    PNG="png"
-    IMAGELIBS="-lfltk_png $IMAGELIBS"
-#    AC_MSG_WARN("*** USING PNG LOCAL SETUP")
 else
     PNGINC=""
     PNG=""
@@ -619,7 +614,6 @@ else
     AC_DEFINE(HAVE_LIBPNG)
     AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
     AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
-#    AC_MSG_WARN("*** USING PNG LIB SETUP")
 fi
 
 AC_SUBST(JPEG)

test/Makefile

@@ -94,8 +94,8 @@ CPPFILES =\
 	tile.cxx \
 	tiled_image.cxx \
 	valuators.cxx \
-	utf8.cxx
-
+	utf8.cxx \
+	utf8c.cxx 
 ALL =	\
 	unittests$(EXEEXT) \
 	adjuster$(EXEEXT) \
@@ -156,7 +156,8 @@ ALL =	\
 	tiled_image$(EXEEXT) \
 	valuators$(EXEEXT) \
 	cairotest$(EXEEXT) \
-	utf8$(EXEEXT) 
+	utf8$(EXEEXT) \
+	utf8c$(EXEEXT) 
 
 
 GLALL = \