comparison octave-bug.cc.in @ 9538:d0239bddf621

use OCTAVE_CHECK_LIB to check for zlib
author John W. Eaton <jwe@octave.org>
date Mon, 17 Aug 2009 19:52:18 -0400
parents 592a959b68e5
children f5ec5dc66824
comparison
equal deleted inserted replaced
9537:8f8cb45ad674 9538:d0239bddf621
148 vars["REGEX_LIBS"] = %REGEX_LIBS%; 148 vars["REGEX_LIBS"] = %REGEX_LIBS%;
149 vars["TERM_LIBS"] = %TERM_LIBS%; 149 vars["TERM_LIBS"] = %TERM_LIBS%;
150 vars["UMFPACK_LIBS"] = %UMFPACK_LIBS%; 150 vars["UMFPACK_LIBS"] = %UMFPACK_LIBS%;
151 vars["X11_INCFLAGS"] = %X11_INCFLAGS%; 151 vars["X11_INCFLAGS"] = %X11_INCFLAGS%;
152 vars["X11_LIBS"] = %X11_LIBS%; 152 vars["X11_LIBS"] = %X11_LIBS%;
153 vars["ZLIB_LIBS"] = %ZLIB_LIBS%; 153 vars["Z_CPPFLAGS"] = %Z_CPPFLAGS%;
154 vars["Z_LDFLAGS"] = %Z_LDFLAGS%;
155 vars["Z_LIBS"] = %Z_LIBS%;
154 156
155 vars["DEFS"] = %OCTAVE_CONF_DEFS%; 157 vars["DEFS"] = %OCTAVE_CONF_DEFS%;
156 158
157 vars["USER"] = get_env_variable ("LOGNAME"); 159 vars["USER"] = get_env_variable ("LOGNAME");
158 if (vars["USER"].empty ()) 160 if (vars["USER"].empty ())
282 os << "REGEX_LIBS: " << vars["REGEX_LIBS"] << endl; 284 os << "REGEX_LIBS: " << vars["REGEX_LIBS"] << endl;
283 os << "TERM_LIBS: " << vars["TERM_LIBS"] << endl; 285 os << "TERM_LIBS: " << vars["TERM_LIBS"] << endl;
284 os << "UMFPACK_LIBS: " << vars["UMFPACK_LIBS"] << endl; 286 os << "UMFPACK_LIBS: " << vars["UMFPACK_LIBS"] << endl;
285 os << "X11_INCFLAGS: " << vars["X11_INCFLAGS"] << endl; 287 os << "X11_INCFLAGS: " << vars["X11_INCFLAGS"] << endl;
286 os << "X11_LIBS: " << vars["X11_LIBS"] << endl; 288 os << "X11_LIBS: " << vars["X11_LIBS"] << endl;
287 os << "ZLIB_LIBS: " << vars["ZLIB_LIBS"] << endl; 289 os << "Z_CPPFLAGS: " << vars["Z_CPPFLAGS"] << endl;
290 os << "Z_LDFLAGS: " << vars["Z_LDFLAGS"] << endl;
291 os << "Z_LIBS: " << vars["Z_LIBS"] << endl;
288 os << "DEFS:" << endl << vars["DEFS"] << endl; 292 os << "DEFS:" << endl << vars["DEFS"] << endl;
289 os << endl; 293 os << endl;
290 294
291 if (arg_idx < argc) 295 if (arg_idx < argc)
292 { 296 {