cdf2d3ced6
* ChangeLog
! Typos.
* source/rtl/hbsocket.c
! Applied patch for BEOS/HAIKU by Tamas Tevesz.
* contrib/hbtip/sendmail.prg
! Fixed to append CRLF instead of hb_osNewLine() to e-mail body.
Patch submitted by Lorenzo Fiorini.
NOTE: This fix is surely valid, I'll apply further fixes as we
manage to find out more on the bigger picture.
* contrib/hbtip/mail.prg
! Applied a few patches from mail.prg sent by Gerald Drouillard:
- Using :setBody() from :New() instead of replicating (little bit
different) logic.
- "Content-Length" deleted from generated e-mail text.
- Added parameter list to METHOD declaration for :setHeader().
* Minor formatting.
* config/beos/libs.mk
+ Applied patch from Tamas Tevesz changing 'socket' lib to 'network' for BEOS/HAIKU.
* utils/hbmk2/hbmk2.prg
+ Done the same for hbmk2 (changed 'socket' lib to 'network' for BEOS/HAIKU).
* config/detfun.mk
+ Changed to avoid duplicate component detection lines in verbose output.
(_DET_OPT_VERB=very|yes - not yet documented)
(note this needs absolute paths to be used when referring to internal
components in _DET_INC_DEFP/_DET_INC_LOCL)
* external/sqlite3/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
* contrib/hbsqlit3/Makefile
* contrib/hbhpdf/Makefile
+ Changed to use absolute paths when referring to locally hosted components
in _DET_INC_LOCL variables.
151 lines
6.7 KiB
Makefile
151 lines
6.7 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
# ---------------------------------------------------------------
|
|
# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
|
|
# See COPYING for licensing terms.
|
|
#
|
|
# This make file will detect optional external components
|
|
# used in Harbour core code. Generic function.
|
|
# ---------------------------------------------------------------
|
|
|
|
# USAGE:
|
|
# ON CALL:
|
|
# _DET_DSP_NAME - human readable name of external component.
|
|
# _DET_VAR_INC_ - variable name containing user component control (typically "HB_INC_*").
|
|
# _DET_VAR_HAS_ - variable name receiving detection result (typically "HB_HAS_*").
|
|
# _DET_FLT_PLAT - positive and negative platform filters. Prefix negative ones with '!' char.
|
|
# _DET_FLT_COMP - positive and negative compiler filters. Prefix negative ones with '!' char.
|
|
# _DET_INC_DEFP - default location to look at. Not effective in 'HB_BUILD_EXTDEF=no' mode.
|
|
# (you must use absolute paths only.)
|
|
# _DET_INC_LOCL - embedded location to look at.
|
|
# (you must use absolute paths only.)
|
|
# _DET_INC_HEAD - header filename to look for. Unless looking for a directory, prefix with forward slash.
|
|
# - variable name specified by _DET_VAR_INC_ (typically "HB_INC_*") containing:
|
|
# (empty) or yes - will enable external component if found on default locations.
|
|
# no - will disable external component.
|
|
# force - will forcibly enable external component, bypassing location checks,
|
|
# HB_HAS_* will have the content '.' (as local dir). In this case user
|
|
# is responsible to pass -I C compiler option manually.
|
|
# local - will choose locally hosted version of external component.
|
|
# nolocal - will disable using locally hosted version of external component.
|
|
# <dirlist> - will specify locations to check for the external component.
|
|
# ON RETURN:
|
|
# - above variables cleared.
|
|
# - _DET_RES_TEXT with human readable detection result.
|
|
# - variable name specified in _DET_VAR_HAS_ (typically "HB_HAS_*") will
|
|
# have any these values:
|
|
# (empty) - we can't use this component
|
|
# <dirlist> - component headers were found at these locations (typically one)
|
|
# - variable name specified in _DET_VAR_HAS_ + "_LOCAL" (typically "HB_HAS_*_LOCAL") will
|
|
# be non-empty if we're using the locally hosted version of the package.
|
|
|
|
# show verbose information (empty|yes|very)
|
|
ifneq ($(_DET_OPT_VERB),)
|
|
do_info = $(info ! Component: $(1))
|
|
else
|
|
do_info =
|
|
endif
|
|
|
|
# preparing switch to HB_WITH_* variables from HB_INC_*
|
|
ifneq ($($(subst HB_INC_,HB_WITH_,$(_DET_VAR_INC_))),)
|
|
$($(subst HB_INC_,HB_WITH_,$(_DET_VAR_INC_))) := $($(_DET_VAR_INC_))
|
|
endif
|
|
|
|
_DET_RES_TEXT :=
|
|
|
|
ifeq ($($(_DET_VAR_HAS_)),)
|
|
$(_DET_VAR_HAS_)_LOCAL :=
|
|
ifneq ($($(_DET_VAR_INC_)),no)
|
|
_DET_POS := $(filter-out !%,$(_DET_FLT_PLAT))
|
|
_DET_NEG := $(subst !,,$(filter !%,$(_DET_FLT_PLAT)))
|
|
ifneq ($(if $(_DET_POS),$(filter $(HB_PLATFORM),$(_DET_POS)),ok),)
|
|
ifeq ($(filter $(HB_PLATFORM),$(_DET_NEG)),)
|
|
_DET_POS := $(filter-out !%,$(_DET_FLT_COMP))
|
|
_DET_NEG := $(subst !,,$(filter !%,$(_DET_FLT_COMP)))
|
|
ifneq ($(if $(_DET_POS),$(filter $(HB_COMPILER),$(_DET_POS)),ok),)
|
|
ifeq ($(filter $(HB_COMPILER),$(_DET_NEG)),)
|
|
$(_DET_VAR_HAS_) := $($(_DET_VAR_INC_))
|
|
ifeq ($($(_DET_VAR_INC_)),yes)
|
|
$(_DET_VAR_HAS_) :=
|
|
else
|
|
# bypass local check
|
|
ifeq ($($(_DET_VAR_INC_)),force)
|
|
$(_DET_VAR_HAS_) := .
|
|
endif
|
|
endif
|
|
ifeq ($($(_DET_VAR_HAS_)),)
|
|
ifneq ($(HB_BUILD_EXTDEF),no)
|
|
$(_DET_VAR_HAS_) := $(_DET_INC_DEFP)
|
|
endif
|
|
$(_DET_VAR_HAS_) += $(_DET_INC_LOCL)
|
|
else
|
|
ifeq ($($(_DET_VAR_HAS_)),nolocal)
|
|
ifneq ($(HB_BUILD_EXTDEF),no)
|
|
$(_DET_VAR_HAS_) := $(_DET_INC_DEFP)
|
|
endif
|
|
endif
|
|
endif
|
|
ifeq ($($(_DET_VAR_INC_)),local)
|
|
$(_DET_VAR_HAS_) := $(_DET_INC_LOCL)
|
|
endif
|
|
ifneq ($($(_DET_VAR_HAS_)),)
|
|
ifneq ($($(_DET_VAR_HAS_)),.)
|
|
$(_DET_VAR_HAS_) := $(strip $(firstword $(foreach d,$($(_DET_VAR_HAS_)),$(if $(wildcard $(d)$(_DET_INC_HEAD)),$(d),))))
|
|
ifeq ($($(_DET_VAR_HAS_)),)
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' not found
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
else
|
|
# detect if the component was found in locally hosted dir
|
|
ifneq ($(_DET_INC_LOCL),)
|
|
ifneq ($(filter $(_DET_INC_LOCL),$($(_DET_VAR_HAS_))),)
|
|
$(_DET_VAR_HAS_)_LOCAL := (local)
|
|
endif
|
|
endif
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' found in $($(_DET_VAR_HAS_)) $($(_DET_VAR_HAS_)_LOCAL)
|
|
ifeq ($(_DET_OPT_VERB),very)
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
endif
|
|
endif
|
|
endif
|
|
else
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' location not specified
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
endif
|
|
else
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' not supported with $(HB_COMPILER) compiler
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
endif
|
|
else
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' not supported with $(HB_COMPILER) compiler
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
endif
|
|
else
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' not supported on $(HB_PLATFORM) platform
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
endif
|
|
else
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' not supported on $(HB_PLATFORM) platform
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
endif
|
|
_DET_POS :=
|
|
_DET_NEG :=
|
|
else
|
|
_DET_RES_TEXT := '$(_DET_DSP_NAME)' explicitly disabled
|
|
$(call do_info,$(_DET_RES_TEXT))
|
|
endif
|
|
endif
|
|
|
|
export $(_DET_VAR_HAS_)
|
|
export $(_DET_VAR_HAS_)_LOCAL
|
|
|
|
_DET_DSP_NAME :=
|
|
_DET_VAR_INC_ :=
|
|
_DET_VAR_HAS_ :=
|
|
_DET_FLT_PLAT :=
|
|
_DET_FLT_COMP :=
|
|
_DET_INC_DEFP :=
|
|
_DET_INC_LOCL :=
|
|
_DET_INC_HEAD :=
|