From f96bbbc387552f4f7ffc664f40bc3dd968a2623c Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Thu, 4 Dec 1997 00:53:24 +0000 Subject: [PATCH] remove libhtmlw from the distribution git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@258 57a11ea4-9604-0410-9ed3-97b8803252fd --- config.h | 7 +++++-- config.h.in | 7 +++++-- configure | 11 ++++++++--- configure.in | 7 ++++++- lib/Makefile | 13 +++++++++---- lib/Makefile.in | 13 +++++++++---- lib/README | 8 ++++---- src/Makefile | 10 +++++++--- src/Makefile.in | 10 +++++++--- 9 files changed, 60 insertions(+), 26 deletions(-) diff --git a/config.h b/config.h index 2d7d135f32..3c76c6036f 100644 --- a/config.h +++ b/config.h @@ -27,7 +27,7 @@ #ifndef __XACC_CONFIG_H__ #define __XACC_CONFIG_H__ -/* Are we bigendian */ +/* Are we bigendian -- needed for reading binary file format */ /* #undef WORDS_BIGENDIAN */ /* Do some memory debugging stuff */ @@ -51,11 +51,14 @@ #define HAVE_PNG 1 #define HAVE_JPEG 1 +/* The XmHTML widget requires XPM to be installed */ #if HAVE_XPM /* #undef USE_HTMLW */ #define USE_XMHTML 1 #else -#define USE_HTMLW 1 +/* NCSA Mosaic htmlw widget is no longer distributed with xacc, + * due to license restrictions, and overall broken-ness */ +/* #define USE_HTMLW 1 */ /* #undef USE_XMHTML */ #endif diff --git a/config.h.in b/config.h.in index f3453df481..4e9b1a4e53 100644 --- a/config.h.in +++ b/config.h.in @@ -26,7 +26,7 @@ #ifndef __XACC_CONFIG_H__ #define __XACC_CONFIG_H__ -/* Are we bigendian */ +/* Are we bigendian -- needed for reading binary file format */ #undef WORDS_BIGENDIAN /* Do some memory debugging stuff */ @@ -50,11 +50,14 @@ #undef HAVE_PNG #undef HAVE_JPEG +/* The XmHTML widget requires XPM to be installed */ #if HAVE_XPM #undef USE_HTMLW #define USE_XMHTML 1 #else -#define USE_HTMLW 1 +/* NCSA Mosaic htmlw widget is no longer distributed with xacc, + * due to license restrictions, and overall broken-ness */ +/* #define USE_HTMLW 1 */ #undef USE_XMHTML #endif diff --git a/configure b/configure index 7861349872..766ae93ecc 100755 --- a/configure +++ b/configure @@ -1644,6 +1644,12 @@ fi +# +# elminate libhtmlw due to license restrictions +# and general broken-ness + +# AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/libhtmlw/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile) + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1731,7 +1737,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile src/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/libhtmlw/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile src/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -1946,4 +1952,3 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/configure.in b/configure.in index df67eb0b18..95d76c5177 100644 --- a/configure.in +++ b/configure.in @@ -65,5 +65,10 @@ AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, AC_SUBST(LIBS) AC_CONFIG_HEADER(config.h) -AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/libhtmlw/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile) +# +# elminate libhtmlw due to license restrictions +# and general broken-ness +# AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/libhtmlw/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile) + +AC_OUTPUT(Makefile src/Makefile lib/Makefile lib/XmHTML-1.1.0/Makefile lib/XmHTML-1.1.0/src/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile) diff --git a/lib/Makefile b/lib/Makefile index 50ebaae1ac..5a57cd458d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -41,27 +41,32 @@ srcdir = . default: @cd XmHTML-1.1.0; $(MAKE) default - @cd libhtmlw; $(MAKE) default @cd ComboBox-1.33; $(MAKE) default @cd Xbae-4.6.2-linas; $(MAKE) default +# libhtmlw no longer distributed with xacc, +# due to license restrictions and overall brokenness +# @cd libhtmlw; $(MAKE) default + depend: @cd XmHTML-1.1.0; $(MAKE) depend - @cd libhtmlw; $(MAKE) depend @cd ComboBox-1.33; $(MAKE) depend @cd Xbae-4.6.2-linas; $(MAKE) depend +# @cd libhtmlw; $(MAKE) depend + clean: @cd XmHTML-1.1.0; $(MAKE) clean - @cd libhtmlw; $(MAKE) clean @cd ComboBox-1.33; $(MAKE) clean @cd Xbae-4.6.2-linas; $(MAKE) clean +# @cd libhtmlw; $(MAKE) clean + distclean: clean rm -f *~ *.o *.bak Makefile @cd XmHTML-1.1.0; $(MAKE) distclean - @cd libhtmlw; $(MAKE) distclean @cd ComboBox-1.33; $(MAKE) distclean @cd Xbae-4.6.2-linas; $(MAKE) distclean +# @cd libhtmlw; $(MAKE) distclean diff --git a/lib/Makefile.in b/lib/Makefile.in index 9435de2c1c..e77c154a13 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -41,27 +41,32 @@ VPATH = @srcdir@ default: @cd XmHTML-1.1.0; $(MAKE) default - @cd libhtmlw; $(MAKE) default @cd ComboBox-1.33; $(MAKE) default @cd Xbae-4.6.2-linas; $(MAKE) default +# libhtmlw no longer distributed with xacc, +# due to license restrictions and overall brokenness +# @cd libhtmlw; $(MAKE) default + depend: @cd XmHTML-1.1.0; $(MAKE) depend - @cd libhtmlw; $(MAKE) depend @cd ComboBox-1.33; $(MAKE) depend @cd Xbae-4.6.2-linas; $(MAKE) depend +# @cd libhtmlw; $(MAKE) depend + clean: @cd XmHTML-1.1.0; $(MAKE) clean - @cd libhtmlw; $(MAKE) clean @cd ComboBox-1.33; $(MAKE) clean @cd Xbae-4.6.2-linas; $(MAKE) clean +# @cd libhtmlw; $(MAKE) clean + distclean: clean rm -f *~ *.o *.bak Makefile @cd XmHTML-1.1.0; $(MAKE) distclean - @cd libhtmlw; $(MAKE) distclean @cd ComboBox-1.33; $(MAKE) distclean @cd Xbae-4.6.2-linas; $(MAKE) distclean +# @cd libhtmlw; $(MAKE) distclean diff --git a/lib/README b/lib/README index 215f7fa324..2514a82d94 100644 --- a/lib/README +++ b/lib/README @@ -15,15 +15,15 @@ that work with Xbae become available, and become easy to build & use. XbaeMatrix: -- modified to support cell widgets -- modified to support cursor position + -- variety of assorted bug fixes -- modified by deleting examples, other non-essential stuff. libhtmlw: - -- modified by deleting examples, other non-essential stuff. - -- will probably be eliminated; will use XmHTML instead, if - things work out. + -- eliminated due to license restrictions and overall brokenness. + Use XmHTML instead. ComboBox: - -- assorted bug fixes + -- variety of assorted bug fixes & enhancements. -- modified by deleting examples, other non-essential stuff. XmHTML: diff --git a/src/Makefile b/src/Makefile index a01c1a0ba0..57e5e92b8b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -33,15 +33,19 @@ INCLPATH = -I/usr/include \ -I./../include \ -I./../lib/ComboBox-1.33 \ -I./../lib/XmHTML-1.1.0/src \ - -I./../lib/Xbae-4.6.2-linas \ - -I./../lib/libhtmlw + -I./../lib/Xbae-4.6.2-linas + +# libhtmlw eliminated due to license restrictions +# and general brokenness +# -I./../lib/libhtmlw + CFLAGS = -O2 -DCELL_WIDGETS=1 LFLAGS = -O2 LIBS = -lXpm -lXm -lXmu -lXt -lXext -lSM -lICE -lX11 -lpng -ljpeg -lz -lm LIBPATH = -L/lib -L/usr/lib -L/usr/X11R6/lib/. TARGET = ../xacc -LIBHTMLW = ../lib/libhtmlw/libhtmlw.a +# LIBHTMLW = ../lib/libhtmlw/libhtmlw.a LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a LIBXBAE = ../lib/Xbae-4.6.2-linas/libXbae.a LIBCOMBO = ../lib/ComboBox-1.33/libComboBox.a diff --git a/src/Makefile.in b/src/Makefile.in index d844e028a8..206e862c63 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -33,15 +33,19 @@ INCLPATH = -I/usr/include \ -I@srcdir@/../include \ -I@srcdir@/../lib/ComboBox-1.33 \ -I@srcdir@/../lib/XmHTML-1.1.0/src \ - -I@srcdir@/../lib/Xbae-4.6.2-linas \ - -I@srcdir@/../lib/libhtmlw + -I@srcdir@/../lib/Xbae-4.6.2-linas + +# libhtmlw eliminated due to license restrictions +# and general brokenness +# -I@srcdir@/../lib/libhtmlw + CFLAGS = @cflags@ -DCELL_WIDGETS=1 LFLAGS = @lflags@ LIBS = @LIBS@ LIBPATH = -L/lib -L/usr/lib -L@x_libraries@/. TARGET = ../xacc -LIBHTMLW = ../lib/libhtmlw/libhtmlw.a +# LIBHTMLW = ../lib/libhtmlw/libhtmlw.a LIBXMHTML= ../lib/XmHTML-1.1.0/src/libXmHTML.a LIBXBAE = ../lib/Xbae-4.6.2-linas/libXbae.a LIBCOMBO = ../lib/ComboBox-1.33/libComboBox.a