aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove libhtmlw from the distribution

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@258 57a11ea4-9604-0410-9ed3-97b8803252fd
zzzoldfeatures/xacc-10-patch
Linas Vepstas 29 years ago
parent eb5ae2a3e0
commit f96bbbc387
9 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File

7
config.h
Unescape View File

@ -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

7
config.h.in
Unescape View File

@ -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

11
configure vendored
Unescape View File

@ -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 <<EOF
@ -1780,7 +1786,7 @@ CEOF
EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"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_FILES=\${CONFIG_FILES-"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"}
EOF
cat >> $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

7
configure.in
Unescape View File

@ -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)

13
lib/Makefile
Unescape View File

@ -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

13
lib/Makefile.in
Unescape View File

@ -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

8
lib/README
Unescape View File

@ -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:

10
src/Makefile
Unescape View File

@ -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

10
src/Makefile.in
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save