split/extconf.rb in tioga-1.8 vs split/extconf.rb in tioga-1.9

@@ -1,10 +1,10 @@
 # main Tioga installation file
 
 require './mkmf2.rb'
 
-$CFLAGS += " -O2 -g -Wall -Werror-implicit-function-declaration"
+$CFLAGS += " -O2 -g -Wall"
 
 # Now, if you want to install the include file, you need to
 # set the EXTCONF_RB_INCLUDE
 if ENV.key?("EXTCONF_RB_INCLUDE")
   include = ENV["EXTCONF_RB_INCLUDE"]
@@ -22,15 +22,16 @@
 setup_dir("Dtable", "Dobjects", 
           "Dobjects/Dtable", include) do |l,b,i|
 #  b.add_sources("symbols.c")
 end
 
-setup_dir("Flate", "", "Flate", include) do |l,b,i|
-#  b.add_sources("symbols.c")
-end
 
+# setup_dir("Flate", "", "Flate", include) do |l,b,i|
+# #  b.add_sources("symbols.c")
+# end
 
+
 setup_dir("Function", "Dobjects", 
           "Dobjects/Function", include) do |l,b,i|
 #  b.add_sources("symbols.c")
 end
 
@@ -59,24 +60,35 @@
               " mk_tioga_sty.rb"],
             ["Tioga/lib/ColorConstants.rb",
              "Tioga/tioga.sty.in", "Tioga/mk_tioga_sty.rb"]
             )
 
-# we check the presence of zlib library
-unless have_header("zlib.h") and have_library("z", "compress", "zlib.h")
-  puts <<"EON"
-Error: you should have zlib (including development files) installed to
-build and run Tioga. You can get it there:
 
-  http://www.zlib.net/
+# Conditional use of embedded zlib
+if have_header("zlib.h") and have_library("z", "compress", "zlib.h")
+  declare_binary_library('Flate', "Flate/*.c")
+else
+  puts "zlib was not found or could not be linked against, using private copy"
+  declare_binary_library('Flate', "Flate/**/*.c")
+end  
 
-If that doesn't solve your problem, please report it on the Tioga tracker:
+add_include_path("Flate/include")
+
+# # we check the presence of zlib library
+# unless have_header("zlib.h") and have_library("z", "compress", "zlib.h")
+#   puts <<"EON"
+# Error: you should have zlib (including development files) installed to
+# build and run Tioga. You can get it there:
+
+#   http://www.zlib.net/
+
+# If that doesn't solve your problem, please report it on the Tioga tracker:
  
-  http://rubyforge.org/tracker/?group_id=701
+#   http://rubyforge.org/tracker/?group_id=701
 
-EON
-  exit 1 
-end
+# EON
+#   exit 1 
+# end
 
 unless have_header("ieee754.h")
   puts "You lack the ieee754.h header file, which might mean lower " +
     "reliability when Marshalling Dvectors and Dtables"
 end