diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 012a0a5046..ca40e8e6eb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-30 11:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * external/libhpdf/Makefile + - Disabled for owatcom due to compilation error. + If someone is interested in patching it for this compiler, + please do. + 2009-03-30 10:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg ! Don't attempt to strip leading 'lib' from libnames, since diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index 87fb1ab970..31ac0c498d 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -10,6 +10,16 @@ ROOT = ../../ LIBNAME=libhpdf +ifeq ($(HB_WITH_LIBHPDF),) +ifeq ($(HB_COMPILER),owatcom) +HB_WITH_LIBHPDF=no +else +HB_WITH_LIBHPDF=yes +endif +endif + +ifeq ($(HB_WITH_LIBHPDF),yes) + ifeq ($(HB_INC_LIBPNG),) ifeq ($(HB_XBUILD),) HB_INC_LIBPNG = /usr/include @@ -89,3 +99,6 @@ include $(TOP)$(ROOT)config/lib.cf else include $(TOP)$(ROOT)config/none.cf endif +else +include $(TOP)$(ROOT)config/none.cf +endif