From 437b4bddf58776ea9f44b49acf2f68311e744dce Mon Sep 17 00:00:00 2001
From: François Revel <mmu_man@netsurf-browser.org>
Date: Fri, 8 Aug 2008 23:47:11 +0000
Subject: - move BeOS specific config vars to separate section - added config
 option for LIBICONV_PLUG, must not be used for BeOS.

svn path=/trunk/netsurf/; revision=4966
---
 Makefile        |  1 +
 Makefile.config | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7c3112bf6..c702ee093 100644
--- a/Makefile
+++ b/Makefile
@@ -220,6 +220,7 @@ $(eval $(call feature_enabled,JPEG,-DWITH_JPEG,-ljpeg,JPEG support))
 $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG support))
 
 $(eval $(call feature_enabled,HARU_PDF,-DWITH_PDF_EXPORT,-lhpdf -lpng,PDF export))
+$(eval $(call feature_enabled,LIBICONV_PLUG,-DLIBICONV_PLUG,,glibc internal iconv))
 
 # common libraries without pkg-config support
 LDFLAGS += -lz
diff --git a/Makefile.config b/Makefile.config
index 8765610f3..dad9c0273 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -28,10 +28,7 @@ NETSURF_USE_MNG := YES
 # Use libharu to enable PDF export and GTK printing support.  There is no
 # auto-detection available for this, as it does not have a pkg-config file
 # Valid options: YES, NO
-ifneq ($(TARGET),beos)
-# not yet on BeOS
 NETSURF_USE_HARU_PDF := YES
-endif
 
 # Enable stripping the NetSurf binary
 # Valid options: YES, NO
@@ -47,6 +44,10 @@ NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; %s)"
 # by editing the end of gui_init2() in riscos/gui.c
 NETSURF_HOMEPAGE := "http://www.netsurf-browser.org/welcome/"
 
+# Force using glibc internal iconv implementation instead of external libiconv
+# Valid options: YES, NO
+NETSURF_USE_LIBICONV_PLUG := YES
+
 # ----------------------------------------------------------------------------
 # RISC OS-specific options
 # ----------------------------------------------------------------------------
@@ -96,6 +97,24 @@ ifeq ($(TARGET),gtk)
 
 endif
 
+# ----------------------------------------------------------------------------
+# BeOS-specific options
+# ----------------------------------------------------------------------------
+ifeq ($(TARGET),beos)
+
+  # Use James Shaw's librosprite for rendering RISC OS Sprites
+  # Valid options: YES, NO, AUTO
+  NETSURF_USE_ROSPRITE := AUTO
+
+  # Use libharu to enable PDF export and GTK printing support.
+  # Valid options: YES, NO
+  NETSURF_USE_HARU_PDF := NO
+
+  # Force using glibc internal iconv implementation instead of external libiconv
+  # Valid options: YES, NO
+  NETSURF_USE_LIBICONV_PLUG := NO
+endif
+
 # ----------------------------------------------------------------------------
 # Amiga-specific options
 # ----------------------------------------------------------------------------
-- 
cgit v1.2.3