This is the promised FreeBSD patch
Sam th
Index: src/af/util/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- src/af/util/Makefile 2000/08/07 22:22:37 1.41
+++ src/af/util/Makefile 2000/11/01 01:53:05
@@ -67,8 +67,6 @@
### add this to the OBJS when we need it for calc.
### $(OBJDIR)/ut_regex.$(OBJ_SUFFIX) \
-ifdef __FreeBSD__
-
OBJS= $(PLATFORM_OBJS) \
$(OBJDIR)/ut_alphahash.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_base64.$(OBJ_SUFFIX) \
@@ -76,26 +74,6 @@
$(OBJDIR)/ut_bytebuf.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_growbuf.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_hash.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_misc.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_png.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_svg.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_pool.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_stack.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_string.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_test.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_timer.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_units.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_vector.$(OBJ_SUFFIX)
-
-else
-
-OBJS= $(PLATFORM_OBJS) \
- $(OBJDIR)/ut_alphahash.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_base64.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_base64_TestRoutines.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_bytebuf.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_growbuf.$(OBJ_SUFFIX) \
- $(OBJDIR)/ut_hash.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_mbtowc.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_misc.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_png.$(OBJ_SUFFIX) \
@@ -108,8 +86,6 @@
$(OBJDIR)/ut_units.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_vector.$(OBJ_SUFFIX) \
$(OBJDIR)/ut_wctomb.$(OBJ_SUFFIX)
-
-endif
include $(ABI_ROOT)/src/config/abi_rules.mk
Index: src/config/require/unix/Makefile
===================================================================
RCS file: /cvsroot/abi/src/config/require/unix/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- src/config/require/unix/Makefile 2000/05/27 04:07:53 1.24
+++ src/config/require/unix/Makefile 2000/11/01 01:53:05
@@ -163,6 +163,23 @@
# was something you installed yourself.
_LIBICONV_:
+
+ifdef __FreeBSD__
+ @if [ -d $(ABI_ROOT)/../libiconv ]; then
+ \
+ echo Found libiconv in peer directory; \
+ if [ ! -r $(ABI_ROOT)/../libiconv/src/config.h ]; then \
+ cd $(ABI_ROOT)/../libiconv; \
+ ./configure; \
+ fi; \
+ $(MAKE) -f Makefile.abi -C $(ABI_ROOT)/../libiconv; \
+ else \
+ echo libiconv not found; \
+ echo TODO provide a nicer error message; \
+ echo TODO with instructions for obtaining it; \
+ exit 1; \
+ fi
+
+else
@if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h ]; then
\
if [ -d $(ABI_ROOT)/../libiconv ]; then \
echo Found libiconv in peer directory; \
@@ -183,6 +200,7 @@
echo "*** are the versions of the libraries we should link against.";
\
echo ; \
fi
+endif
#################################################################
Index: src/wp/main/unix/Makefile
===================================================================
RCS file: /cvsroot/abi/src/wp/main/unix/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- src/wp/main/unix/Makefile 2000/10/17 00:30:37 1.45
+++ src/wp/main/unix/Makefile 2000/11/01 01:53:06
@@ -37,17 +37,21 @@
LoadOrder= AbiGr AbiFmt AbiPTbl AbiImpExp AbiXAp AbiWPAp \
AbiEv AbiUtil AbiWordVer AbiSpell Abi_libwv
else
-LoadOrder= AbiGr AbiFmt AbiPTbl AbiImpExp AbiXAp AbiWPAp \
+LoadOrder= Abi_libiconv AbiGr AbiFmt AbiPTbl AbiImpExp AbiXAp AbiWPAp \
AbiEv AbiUtil AbiWordVer AbiSpell Abi_expat Abi_libwv
endif
+ifdef __FreeBSD__
+#LoadOrder+= Abi_libiconv
+endif
+
ABI_APPLIBS= $(LoadOrder) $(LoadOrder) $(LoadOrder)
ABI_APPLIBDEP= $(LoadOrder)
-
+
# libdl flags go into the process later
ABI_LIBS= png z
ifdef __FreeBSD__
-ABI_LIBS+= iconv
+#ABI_LIBS+= iconv intl
endif # FreeBSD
ifdef __OpenBSD__
ABI_LIBS+= iconv intl
@@ -75,7 +79,9 @@
ifeq ($(UNIX_CAN_BUILD_DYNAMIC),1)
@$(MAKE_OBJDIR)
@echo Linking dynamic $(PROGRAM)
- @$(CCC) -o $@ $(CFLAGS) $(OBJS) $(DYNAMIC_LDFLAGS) -L/usr/local/lib
$(LDFLAGS) $(EXTRA_LIBS) $(XLDFLAGS)
+ @echo $(CCC) -o $@ $(CFLAGS) $(OBJS) $(DYNAMIC_LDFLAGS) -lintl -lAbi_libiconv
+$(LDFLAGS) $(EXTRA_LIBS) $(XLDFLAGS)
+ @$(CCC) -o $@ $(CFLAGS) $(OBJS) $(DYNAMIC_LDFLAGS) -lintl -lAbi_libiconv
+$(LDFLAGS) $(EXTRA_LIBS) $(XLDFLAGS)
+
else
@echo "Not linking dynamic $(PROGRAM)"
@echo " UNIX_CAN_BUILD_DYNAMIC not defined for this platform."
