From 7ecd51047e9c82f3fdf972f323e69415feabda6f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 9 Jan 2009 00:07:50 +0000
Subject: [PATCH] *** empty log message ***
---
configure | 6 ++----
configure.in | 7 ++-----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index b4af543c9f..e3e5809b2b 100755
--- a/configure
+++ b/configure
@@ -5149,13 +5149,11 @@ if test "x${HDF5}" = "xyes"; then
fi
if test "x${ZLIB}" = "xyes"; then
- if test "x${FL_ZLIB}" = "xyes"; then
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBZ 1
_ACEOF
- else
- FLAGS="-DHAVE_LIBZ ${FLAGS}"
+ if test "x${FL_ZLIB}" != "xyes"; then
if test "x${ZLIB_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lz"
else
diff --git a/configure.in b/configure.in
index a16c4525da..f68f635636 100644
--- a/configure.in
+++ b/configure.in
@@ -646,11 +646,8 @@ fi
dnl Complete zlib link line (zlib must be linked in after libpng and
dnl libhdf5)
if test "x${ZLIB}" = "xyes"; then
- dnl If provided by FLTK, use that one; otherwise, look for it
- if test "x${FL_ZLIB}" = "xyes"; then
- AC_DEFINE(HAVE_LIBZ)
- else
- FLAGS="-DHAVE_LIBZ ${FLAGS}"
+ AC_DEFINE(HAVE_LIBZ)
+ if test "x${FL_ZLIB}" != "xyes"; then
if test "x${ZLIB_PREFIX}" = "x"; then
GMSH_LIBS="${GMSH_LIBS} -lz"
else
--
GitLab