From 4662f73fd3a41eae12a0cfb4690e2b8976fef199 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 28 May 2008 14:37:33 +0000 Subject: [PATCH] 2008-05-28 16:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour-ce-spec * harbour/harbour-w32-spec * harbour/harbour.spec * harbour/make_rpmce.sh * harbour/make_rpmw32.sh * harbour/make_rpm.sh * removed --with zlib switch - now zlib will be created in all builds * added hbzlib library * added hbmzip library - MiniZIP wrapper to manage ZIP files * harbour/contrib/Makefile * added hbmzip library to default builds * harbour/include/hbzlib.h ! changed \ in include path ! added relative paths for LCC and XCC * harbour/bin/hb-func.sh * updated for hbzlib library in core code and hbmzip in contrib * harbour/utils/hbdot/Makefile * harbour/utils/hbrun/Makefile * added hbzlib library to linked library list * harbour/include/hbzlib.h * harbour/bin/hb-func.sh * harbour/make_gcc.mak * harbour/config/darwin/gcc.cf * harbour/config/hpux/gcc.cf * harbour/config/linux/gcc.cf * harbour/config/sunos/gcc.cf * harbour/config/bsd/gcc.cf * harbour/utils/hbdot/Makefile * harbour/utils/hbrun/Makefile + added support for compilation with HB_EXT_ZLIB macro It forces using external (OS) ZLIB library instead of hbzlib. Still some other make files should be updated to respect it. --- harbour/ChangeLog | 39 ++++++++++++++++++++++++++++++++++++ harbour/bin/hb-func.sh | 8 ++++++-- harbour/config/bsd/gcc.cf | 4 ++++ harbour/config/darwin/gcc.cf | 4 ++++ harbour/config/hpux/gcc.cf | 4 ++++ harbour/config/linux/gcc.cf | 4 ++++ harbour/config/sunos/gcc.cf | 4 ++++ harbour/contrib/Makefile | 2 +- harbour/harbour-ce-spec | 9 ++++----- harbour/harbour-w32-spec | 9 ++++----- harbour/harbour.spec | 8 +++----- harbour/include/hbzlib.h | 10 ++++++++- harbour/make_gcc.mak | 5 +++++ harbour/make_rpm.sh | 5 ----- harbour/make_rpmce.sh | 4 ---- harbour/make_rpmw32.sh | 4 ---- harbour/utils/hbdot/Makefile | 4 ++++ harbour/utils/hbrun/Makefile | 4 ++++ 18 files changed, 99 insertions(+), 32 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fd2d4e129b..03b4dcdc01 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,45 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-28 16:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/harbour-ce-spec + * harbour/harbour-w32-spec + * harbour/harbour.spec + * harbour/make_rpmce.sh + * harbour/make_rpmw32.sh + * harbour/make_rpm.sh + * removed --with zlib switch - now zlib will be created in all builds + * added hbzlib library + * added hbmzip library - MiniZIP wrapper to manage ZIP files + + * harbour/contrib/Makefile + * added hbmzip library to default builds + + * harbour/include/hbzlib.h + ! changed \ in include path + ! added relative paths for LCC and XCC + + * harbour/bin/hb-func.sh + * updated for hbzlib library in core code and hbmzip in contrib + + * harbour/utils/hbdot/Makefile + * harbour/utils/hbrun/Makefile + * added hbzlib library to linked library list + + * harbour/include/hbzlib.h + * harbour/bin/hb-func.sh + * harbour/make_gcc.mak + * harbour/config/darwin/gcc.cf + * harbour/config/hpux/gcc.cf + * harbour/config/linux/gcc.cf + * harbour/config/sunos/gcc.cf + * harbour/config/bsd/gcc.cf + * harbour/utils/hbdot/Makefile + * harbour/utils/hbrun/Makefile + + added support for compilation with HB_EXT_ZLIB macro + It forces using external (OS) ZLIB library instead of hbzlib. + Still some other make files should be updated to respect it. + 2008-05-28 14:42 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * bin/bld.bat * bin/bld_os2.cmd diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index d19328a33c..1be2a47836 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -71,7 +71,7 @@ mk_hbgetlibs() then libs="$libs gtwin" fi - echo -n "hbvm hbpp hbrtl hbrdd rddfpt rddcdx rddntx hbhsx hbsix hbusrrdd ${HB_DB_DRVEXT} hbmacro hbcommon hblang hbcpage gtcrs gtsln gtxvt gtxwc gtalleg gtcgi gtstd gtpca gttrm $libs gtwvt gtgui gtdos gtos2 hbdebug profiler hbcplr hbpcre" + echo -n "hbvm hbpp hbrtl hbrdd rddfpt rddcdx rddntx hbhsx hbsix hbusrrdd ${HB_DB_DRVEXT} hbmacro hbcommon hblang hbcpage gtcrs gtsln gtxvt gtxwc gtalleg gtcgi gtstd gtpca gttrm $libs gtwvt gtgui gtdos gtos2 hbdebug profiler hbcplr hbpcre hbzlib" else echo -n "$@" fi @@ -88,7 +88,7 @@ mk_hbgetlibsctb() then libs="$libs gtwin" fi - echo -n "$libs rddads hbct hbnf hbzlib hbtip xhb hbgd hbodbc hbpg hbmysql rddado hbw32 gtwvg $HB_USR_LIBS" + echo -n "$libs rddads hbct hbnf hbmzip hbtip xhb hbgd hbodbc hbpg hbmysql rddado hbw32 gtwvg $HB_USR_LIBS" else echo -n "$@" fi @@ -138,6 +138,10 @@ mk_hbtools() elif [ "${C_USR//-DHB_POSIX_REGEX/}" != "${C_USR}" ]; then hb_libs="${hb_libs//hbpcre/}" fi + if [ "${C_USR//-DHB_EXT_ZLIB/}" != "${C_USR}" ]; then + HB_SYS_LIBS="-lz ${HB_SYS_LIBS}" + hb_libs="${hb_libs//hbzlib/}" + fi if [ "${HB_COMPILER}" = "mingw32" ]; then HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lwsock32 -lws2_32" elif [ "${HB_COMPILER}" = "cemgw" ]; then diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index f7a602cd7a..04aa8707a5 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -81,6 +81,10 @@ ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) LINKLIBS += -lpcre endif +ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +LINKLIBS += -lz +endif + LINKLIBS += -lm -Wl,--end-group LDFLAGS += $(LINKPATHS) diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index 209929060a..35885cdc5f 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -92,6 +92,10 @@ ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) LINKLIBS += -lpcre endif +ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +LINKLIBS += -lz +endif + LINKLIBS += -lm LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 703ccdf03a..18b885e87d 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -77,6 +77,10 @@ ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) LINKLIBS += -lpcre endif +ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +LINKLIBS += -lz +endif + LINKLIBS += -lm -lrt LDFLAGS += $(LINKPATHS) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index bae1a8ae76..e2e60077a6 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -84,6 +84,10 @@ ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) LINKLIBS += -lpcre endif +ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +LINKLIBS += -lz +endif + LINKLIBS += -lm -ldl -Wl,--end-group LDFLAGS = $(LINKPATHS) diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index af9cf3726c..56b723e8a4 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -73,6 +73,10 @@ ifneq ($(findstring -DHB_PCRE_REGEX, $(C_USR)),) LINKLIBS += -lpcre endif +ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +LINKLIBS += -lz +endif + LINKLIBS += -lm -lrt LDFLAGS = $(LINKPATHS) diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 50e05bb834..1318a232b6 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -13,8 +13,8 @@ DIRS=\ hbclipsm \ hbvpdf \ xhb \ + hbmzip \ # examples \ -# hbmzip \ ifneq ($(HB_ARCHITECTURE),dos) diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index a3186419e8..409529a361 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -16,7 +16,6 @@ # --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver # --with ads - build ADS RDD -# --with zlib - build zlib and minizip wrapper # --with odbc - build odbc lib # --without nf - do not build nanforum lib ###################################################################### @@ -118,7 +117,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" make -r @@ -149,7 +148,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL @@ -167,7 +166,6 @@ make -r -i install [ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a [ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a -[ "%{?_with_zlib:1}" ] || rm -f $HB_LIB_INSTALL/libhbzlib.a [ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a # Keep the size of the libraries to a minimim. @@ -316,6 +314,7 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhblang.a %{_libdir}/%{name}/libhbmacro.a %{_libdir}/%{name}/libhbpcre.a +%{_libdir}/%{name}/libhbzlib.a %{_libdir}/%{name}/libhbnulrdd.a %{_libdir}/%{name}/libhbpp.a %{_libdir}/%{name}/libhbrdd.a @@ -329,13 +328,13 @@ rm -fR $RPM_BUILD_ROOT %{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} %{?_with_ads: %{_libdir}/%{name}/librddads.a} -%{?_with_zlib: %{_libdir}/%{name}/libhbzlib.a} %{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a %{_libdir}/%{name}/libhbmisc.a +%{_libdir}/%{name}/libhbmzip.a %{_libdir}/%{name}/libhbct.a %{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index fe5e6f7bdb..75742ccc88 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -16,7 +16,6 @@ # --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver # --with ads - build ADS RDD -# --with zlib - build zlib and minizip wrapper # --with odbc - build odbc lib # --without nf - do not build nanforum lib ###################################################################### @@ -118,7 +117,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" make -r @@ -149,7 +148,7 @@ export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/harbour export HB_LIB_INSTALL=%{_libdir}/%{name} export HB_GTALLEG=%{?_with_allegro:yes} -export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL @@ -167,7 +166,6 @@ make -r -i install [ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a [ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a -[ "%{?_with_zlib:1}" ] || rm -f $HB_LIB_INSTALL/libhbzlib.a [ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a # Keep the size of the libraries to a minimim. @@ -316,6 +314,7 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhblang.a %{_libdir}/%{name}/libhbmacro.a %{_libdir}/%{name}/libhbpcre.a +%{_libdir}/%{name}/libhbzlib.a %{_libdir}/%{name}/libhbnulrdd.a %{_libdir}/%{name}/libhbpp.a %{_libdir}/%{name}/libhbrdd.a @@ -328,13 +327,13 @@ rm -fR $RPM_BUILD_ROOT %{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} %{?_with_ads: %{_libdir}/%{name}/librddads.a} -%{?_with_zlib: %{_libdir}/%{name}/libhbzlib.a} %{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a %{_libdir}/%{name}/libhbmisc.a +%{_libdir}/%{name}/libhbmzip.a %{_libdir}/%{name}/libhbct.a %{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 3a9b469747..e8fa7837b9 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -19,7 +19,6 @@ # --with gd - build gd lib # --with allegro - build GTALLEG - Allegro based GT driver # --with ads - build ADS RDD -# --with zlib - build zlib and minizip wrapper # --with odbc - build odbc lib # --without nf - do not build nanforum lib # --without gpllib - do not build libs which needs GPL 3-rd party code @@ -79,7 +78,7 @@ %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_opt export HB_GTALLEG=%{?_with_allegro:yes} %define hb_cmrc export HB_COMMERCE=%{?_without_gpllib:yes} -%define hb_ctrb export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_zlib:hbzlib} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" +%define hb_ctrb export HB_CONTRIBLIBS="%{?_with_odbc:hbodbc} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" %define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_opt} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org @@ -266,7 +265,6 @@ case "`uname -m`" in esac [ "%{?_with_odbc:1}" ] || rm -fR contrib/hbodbc -[ "%{?_with_zlib:1}" ] || rm -fR contrib/hbzlib [ "%{?_with_ads:1}" ] || rm -fR contrib/rddads [ "%{?_without_nf:1}" ] && rm -fR contrib/hbnf @@ -303,7 +301,6 @@ make -r -i install [ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a [ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a [ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a -[ "%{?_with_zlib:1}" ] || rm -f $HB_LIB_INSTALL/libhbzlib.a [ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a [ "%{?_without_gtsln:1}" ] && rm -f $HB_LIB_INSTALL/libgtsln.a @@ -525,6 +522,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhblang.a %{_libdir}/%{name}/libhbmacro.a %{_libdir}/%{name}/libhbpcre.a +%{_libdir}/%{name}/libhbzlib.a %{_libdir}/%{name}/libhbnulrdd.a %{_libdir}/%{name}/libhbpp.a %{_libdir}/%{name}/libhbrdd.a @@ -539,7 +537,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/%{name} %{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} %{?_with_ads: %{_libdir}/%{name}/librddads.a} -%{?_with_zlib: %{_libdir}/%{name}/libhbzlib.a} %{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} @@ -547,6 +544,7 @@ rm -rf $RPM_BUILD_ROOT %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a %{_libdir}/%{name}/libhbmisc.a +%{_libdir}/%{name}/libhbmzip.a %{_libdir}/%{name}/libhbct.a %{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a diff --git a/harbour/include/hbzlib.h b/harbour/include/hbzlib.h index c041f9dde5..50dbd76836 100644 --- a/harbour/include/hbzlib.h +++ b/harbour/include/hbzlib.h @@ -50,4 +50,12 @@ * */ -#include "..\source\hbzlib\zlib.h" +#if defined( HB_EXT_ZLIB ) +# include +#else +# if defined(__XCC__) || defined(__LCC__) +# include "source\hbzlib\zlib.h" +# else +# include "../source/hbzlib/zlib.h" +# endif +#endif diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index c482f3b2d6..0c28329a2e 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -231,6 +231,11 @@ ifneq ($(findstring -DHB_PCRE_REGEX, $(CFLAGS)),) LDFLAGS += -lpcre endif +# ZLIB library +ifneq ($(findstring -DHB_EXT_ZLIB, $(CFLAGS)),) +LDFLAGS += -lz +endif + LDFLAGS += $(__GROUP_LIBS_END__) $(HB_OS_LIBS) ifeq ($(HB_ARCHITECTURE),os2) diff --git a/harbour/make_rpm.sh b/harbour/make_rpm.sh index 4c1657d76b..72f48f0703 100755 --- a/harbour/make_rpm.sh +++ b/harbour/make_rpm.sh @@ -19,7 +19,6 @@ # --with odbc - build odbc lib # --with allegro - build GTALLEG - Allegro based GT driver # --with ads - build ADS RDD -# --with zlib - build zlib and minizip wrapper # --without gpllib - do not build libs which needs GPL 3-rd party code # --without nf - do not build nanforum lib # --without x11 - do not build GTXWC @@ -108,10 +107,6 @@ if test_reqrpm "allegro-devel" then INST_PARAM="${INST_PARAM} --with allegro" fi -if [ -f /usr/include/zlib.h ] || test_reqrpm "zlib-devel" -then - INST_PARAM="${INST_PARAM} --with zlib" -fi if [ -f /usr/local/ads/acesdk/ace.h ] || [ -f ${HOME}/ads/acesdk/ace.h ] then INST_PARAM="${INST_PARAM} --with ads" diff --git a/harbour/make_rpmce.sh b/harbour/make_rpmce.sh index 43ac40c393..c13e5a77ed 100755 --- a/harbour/make_rpmce.sh +++ b/harbour/make_rpmce.sh @@ -72,10 +72,6 @@ if [ -f /usr/local/ads/acesdk/ace.h ] || \ then INST_PARAM="${INST_PARAM} --with ads" fi -if [ -f /opt/mingw32ce/include/zlib.h ] -then - INST_PARAM="${INST_PARAM} --with zlib" -fi TOINST_LST="" for i in ${NEED_RPM} diff --git a/harbour/make_rpmw32.sh b/harbour/make_rpmw32.sh index d3000477e6..54d1f4dae9 100755 --- a/harbour/make_rpmw32.sh +++ b/harbour/make_rpmw32.sh @@ -94,10 +94,6 @@ if [ -f /usr/local/ads/acesdk/ace.h ] || \ then INST_PARAM="${INST_PARAM} --with ads" fi -if [ -f ${MINGW_DIR}/include/zlib.h ] -then - INST_PARAM="${INST_PARAM} --with zlib" -fi TOINST_LST="" for i in ${NEED_RPM} diff --git a/harbour/utils/hbdot/Makefile b/harbour/utils/hbdot/Makefile index 753b58746d..dd1866398e 100644 --- a/harbour/utils/hbdot/Makefile +++ b/harbour/utils/hbdot/Makefile @@ -33,4 +33,8 @@ LIBS += hbpcre endif endif +ifeq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +LIBS += hbzlib +endif + include $(TOP)$(ROOT)config/bin.cf diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile index 270401683b..2056880e99 100644 --- a/harbour/utils/hbrun/Makefile +++ b/harbour/utils/hbrun/Makefile @@ -34,4 +34,8 @@ LIBS += hbpcre endif endif +ifeq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),) +LIBS += hbzlib +endif + include $(TOP)$(ROOT)config/bin.cf