Attachment #171948 for bug #165280




# Rules to rebuild the libWWW package
#

# removed because gentoo net-libs/libwww handles all of this.  all of this stuff is in /usr/lib/
# MKP: adding libwwwdav
#AMAYA_LIBWWW_STANDARD_LIBS = \
#	libwwwapp \
#	libwwwhttp \
#	libwwwhtml \
#	libwwwmime \
#	libwwwcache \
#	libwwwstream \
#	libwwwfile \
#	libwwwdir \
#	libwwwtrans \
#	libwwwcore \
#	libwwwutils \
#	libwwwftp \
#	@MAKE_LIBWWW_RDF_PARSER@ \
#	libwwwzip \
#        @LIBDAV@

#libwww_config :
#	@(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \
#	      $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \
#	  fi)
#	@(if [ ! -d $(LIBWWW) ] ; then \
#		$(MKDIR) $(LIBWWW) ; \
#          fi)
##MKP: adding --with-dav
#	@(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \
#	  cd $(LIBWWW) ; unset LANG; \
#	  if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
#	  	$$libwwwdir/configure \
#			--build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \
#			--disable-shared \
#			@WITHDAV@ \
#			--with-zlib; \
#		$(ECHO) "libwww is configured" ; \
#		$(ECHO) "patching wwwconf.h because appkit.h do not compile on macos, and it seems that appkit.h is not used in amaya" ; \
#		$(CP) wwwconf.h wwwconf.h.orig ; \
#		$(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \
#			wwwconf.h.orig > wwwconf.h ; \
#                $(ECHO) "wwwconf.h patched !" ; \
#	  fi)
#
#libwww_make_module_md5 \
#libmd5 : force
#		@(localdir=`pwd`; \
#		 cd $(LIBWWW)/modules/md5 ; \
#		 $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
#		 CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
#	        	    libmd5.la)
#
#libwww_install_module_md5 : force
#		@(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \
#			$(RM) libmd5.a ; \
#		  fi ; \
#		  if [ ! -L libmd5.a ] ; then \
#			$(LN_S) $(LIBWWW)/modules/md5/.libs/libmd5.a ./libmd5.a ; \
#		  fi)
#
#libwww_make_module_expat \
#libexpat : force
		@(localdir=`pwd`; \
		  cd $(LIBWWW)/modules/expat/ ; \
		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
		  CPPFLAGS="$(CPPFLAGS)" \
	        	    )

libwww_install_module_expat : force
		@(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
			$(RM) libexpat.a ; \
		  fi ; \
		  if [ ! -L libexpat.a ] ; then \
			$(LN_S) $(LIBWWW)/modules/expat/.libs/libexpat.a ./libexpat.a ; \
		  fi)

#libwww_make_module_idn \
#libidn : force
#		@(localdir=`pwd`; \
#		  cd $(LIBWWW)/modules/expat/ ; \
#		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
#		  CPPFLAGS="$(CPPFLAGS)" \
#	        	    )
#
#libwww_install_module_expat : force
#		@(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
#			$(RM) libexpat.a ; \
#		  fi ; \
#		  if [ ! -L libexpat.a ] ; then \
#			$(LN_S) $(LIBWWW)/modules/expat/.libs/libexpat.a ./libexpat.a ; \
#		  fi)
#
##libwww_make_module_idn \
##libidn : force
##		@(localdir=`pwd`; \
##		  cd $(LIBWWW)/modules/idn/ ; \
##		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DLIBWWW_USEIDN" \
##		  CPPFLAGS="$(CPPFLAGS)" \
##	        	    )
#
##libwww_install_module_idn : force
##		@(if [ -e libidn.a -a ! -L libidn.a ] ; then \
##			$(RM) libidn.a ; \
##		  fi ; \
##		  if [ ! -L libidn.a ] ; then \
##			$(LN_S) $(LIBWWW)/modules/idn/.libs/libidn.a ./libidn.a ; \
##		  fi)
#
#libwww_make_standard_libs \
#$(AMAYA_LIBWWW_STANDARD_LIBS) : force
#		@(localdir=`pwd`; \
#		  all_libs="" ; \
#		  for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
#		      all_libs="$$all_libs $$lib.la" ; \
#		   done ; \
#		  cd $(LIBWWW)/Library/src ; \
#		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
#		  CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
#			     $$all_libs)
#
#libwww_install_standard : force
#		@(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
#		    if [ -e $$lib.a -a ! -L $$lib.a ] ; then \
#			$(RM) $$lib.a ;  \
#		    fi ; \
#		    if [ ! -L $$lib.a ] ; then \
#			$(LN_S) $(LIBWWW)/Library/src/.libs/$$lib.a ./$$lib.a ; \
#		    fi ; \
#		done)
#
##libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat libwww_make_module_idn
#libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat
#libwww_make : libwww_make_module_libs libwww_make_standard_libs
##libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat libwww_install_module_idn
#libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat
#libwww_install : libwww_install_modules libwww_install_standard 
#
#libwww : libwww_config libwww_make
#		@($(ECHO) "libwww is installed")

#
# Rules to build the raptor RDF library

	rm -f ../TAGS
	find ../ -name "*.[hc]" -print | xargs etags --declarations -a -o ../TAGS

libwww:
	echo "make libwww: Not in gentoo"

dummy:







#MKP: added -lwwwdav
AMAYA_LIBWWW_LIBS= \
			-L/usr/lib \
			$(LIBWWW_RDF_PARSER) \
			-lwwwzip \
			-lwwwapp \

			-lwwwcore \
			-lwwwutils \
			$(WWWDAV) \
		-L../$(LIBWWW)/modules/md5/.libs \
			-lmd5 \
			-L/usr/lib/libexpat.a
#		-L../$(LIBWWW)/modules/expat/.libs \
#			-lexpat \

AMAYA_LIBWWW_EXTRA_LIBS=

AMAYA_LIBWWW_INCLUDES= -I/usr/include -I/usr/include/w3c-libwww

#AMAYA_LIBWWW_INCLUDES= -I../libwww \
#		-I$(THOTDIR)/../libwww/Library/src \
#		-I$(THOTDIR)../libwww/modules/md5 \
#		-I$(THOTDIR)/../libwww/modules/expat/lib

# this dependency calls the ../Makefile rule that compiles libwww
AMAYA_LIBWWW_SRC= amaya_comp_libwww

Lines 14-22 Link Here

(-)Amaya.orig/annotlib/Makefile.in (-3 / +2 lines)
14		14
15	INCLUDES= -DHAVE_CONFIG_H -DANNOTATIONS \	15	INCLUDES= -DHAVE_CONFIG_H -DANNOTATIONS \
16	-I.. -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \	16	-I.. -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
17	-I@top_srcdir@/amaya/f -I../libwww \	17	-I@top_srcdir@/amaya/f \
18	-I@top_srcdir@/../libwww/Library/src \	18	-I/usr/include/w3c-libwww
19	-I@top_srcdir@/../libwww/modules/expat/lib \
20	@AMAYA_RAPTOR_INCLUDES@ @THOTINCLUDES@ $(GUI_INCLUDES)	19	@AMAYA_RAPTOR_INCLUDES@ @THOTINCLUDES@ $(GUI_INCLUDES)
21		20
22		21




		mkdir $BUILDRAPTOR
		cd $BUILDRAPTOR &&
			CC="$CC" CXX="$CXX" \
			CPPFLAGS="-I/usr/include -I/usr/include/w3c-libwww" \
			LDFLAGS="-L$CURRENTPATH/libwww/modules/expat -L$CURRENTPATH/libwww/modules/expat/.libs" \
			/usr/lib \
			../../../redland/raptor/configure \
			--build=$build_alias --host=$host_alias --target=$target_alias \
			--disable-shared \



if test "$build_amaya" = "yes" ; then
dnl	#this should be handled by arguments, breaks gentoo
dnl     if test ! -f $srcdir/../libwww/Makefile.in ; then
dnl 	AC_MSG_WARN(libwww sources not found !!)
dnl 	AC_MSG_WARN(Disabling Amaya build !)
dnl 	build_amaya="no"
dnl     fi

    if test ! -f $srcdir/amaya/MathML.S ; then
	if test "$with_math" = "yes" ; then

Lines 8-14 Link Here

(-)Amaya.orig/davlib/Makefile.dav (-1 / +1 lines)
8		8
9	AMAYA_DAV_INCLUDES=-I$(THOTDIR)/davlib/h -I$(THOTDIR)/davlib/tree/h -I$(THOTDIR)/davlib/f	9	AMAYA_DAV_INCLUDES=-I$(THOTDIR)/davlib/h -I$(THOTDIR)/davlib/tree/h -I$(THOTDIR)/davlib/f
10		10
11	AMAYA_DAV_OBJ= ../libwww/Library/src/HTHome.o	11	#AMAYA_DAV_OBJ= ../libwww/Library/src/HTHome.o
12		12
13	AMAYA_DAV_SRC= ../davlib/davlib.a	13	AMAYA_DAV_SRC= ../davlib/davlib.a
14		14





INCLUDES =-DHAVE_CONFIG_H -I.. \
	  -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
	  -I@top_srcdir@/amaya/f -I/usr/include/w3c-libwww \
	  -I@top_srcdir@/thotlib/include \
	  -I/usr/include \
	  -I/usr/include/w3c-libwww \
	  -I$(DAVLIB)/tree/h -I$(DAVLIB)/h \
	  $(GUI_INCLUDES)



tree : list.o awstring.o awpair.o awnode.o awtree.o

HTHome.o :
	@(echo "Not for gentoo v. HTHome.o")

clean :
	$(RM) *.a

	awnode.o \
	awstring.o \
	awpair.o \
	list.o 
	../$(LIBWWW)/Library/src/HTHome.o

#
# dependencies

Lines 28-34 Link Here

(-)Amaya.orig/tools/mkdep/Makefile.in (-1 / +1 lines)
28	uninstall :	28	uninstall :
29		29
30	test: all	30	test: all
31	./mkdep -I../../../libwww/Library/src \	31	./mkdep -I/usr/include/w3c-libwww \
32	-I../../../thotlib/internals/h \	32	-I../../../thotlib/internals/h \
33	-I../../../thotlib/internals/var \	33	-I../../../thotlib/internals/var \
34	-I../../../thotlib/internals/f \	34	-I../../../thotlib/internals/f \

Return to bug 165280

Lines 129-255 Link Here

(-)Amaya.orig/Makefile.in (-115 / +119 lines)
129	# Rules to rebuild the libWWW package	129	# Rules to rebuild the libWWW package
130	#	130	#
131		131
		132	# removed because gentoo net-libs/libwww handles all of this. all of this stuff is in /usr/lib/
132	# MKP: adding libwwwdav	133	# MKP: adding libwwwdav
133	AMAYA_LIBWWW_STANDARD_LIBS = \	134	#AMAYA_LIBWWW_STANDARD_LIBS = \
134	libwwwapp \	135	# libwwwapp \
135	libwwwhttp \	136	# libwwwhttp \
136	libwwwhtml \	137	# libwwwhtml \
137	libwwwmime \	138	# libwwwmime \
138	libwwwcache \	139	# libwwwcache \
139	libwwwstream \	140	# libwwwstream \
140	libwwwfile \	141	# libwwwfile \
141	libwwwdir \	142	# libwwwdir \
142	libwwwtrans \	143	# libwwwtrans \
143	libwwwcore \	144	# libwwwcore \
144	libwwwutils \	145	# libwwwutils \
145	libwwwftp \	146	# libwwwftp \
146	@MAKE_LIBWWW_RDF_PARSER@ \	147	# @MAKE_LIBWWW_RDF_PARSER@ \
147	libwwwzip \	148	# libwwwzip \
148	@LIBDAV@	149	# @LIBDAV@
149		150
150	libwww_config :	151	#libwww_config :
151	@(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \	152	# @(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \
152	$(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \	153	# $(ECHO) "Error libwww dir not found at $(THOTDIR)/../$(LIBWWW)" ; \
153	fi)	154	# fi)
154	@(if [ ! -d $(LIBWWW) ] ; then \	155	# @(if [ ! -d $(LIBWWW) ] ; then \
155	$(MKDIR) $(LIBWWW) ; \	156	# $(MKDIR) $(LIBWWW) ; \
156	fi)	157	# fi)
157	#MKP: adding --with-dav	158	##MKP: adding --with-dav
158	@(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \	159	# @(localdir=`pwd` ; libwwwdir="$$localdir/../../$(LIBWWW)" ; \
159	cd $(LIBWWW) ; unset LANG; \	160	# cd $(LIBWWW) ; unset LANG; \
160	if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \	161	# if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
161	$$libwwwdir/configure \	162	# $$libwwwdir/configure \
162	--build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \	163	# --build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \
163	--disable-shared \	164	# --disable-shared \
164	@WITHDAV@ \	165	# @WITHDAV@ \
165	--with-zlib; \	166	# --with-zlib; \
166	$(ECHO) "libwww is configured" ; \	167	# $(ECHO) "libwww is configured" ; \
167	$(ECHO) "patching wwwconf.h because appkit.h do not compile on macos, and it seems that appkit.h is not used in amaya" ; \	168	# $(ECHO) "patching wwwconf.h because appkit.h do not compile on macos, and it seems that appkit.h is not used in amaya" ; \
168	$(CP) wwwconf.h wwwconf.h.orig ; \	169	# $(CP) wwwconf.h wwwconf.h.orig ; \
169	$(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \	170	# $(SED) "s/\(\#define HAVE_APPKIT_APPKIT_H 1\)/\/* \1 *\//" \
170	wwwconf.h.orig > wwwconf.h ; \	171	# wwwconf.h.orig > wwwconf.h ; \
171	$(ECHO) "wwwconf.h patched !" ; \	172	# $(ECHO) "wwwconf.h patched !" ; \
172	fi)	173	# fi)
173		174	#
174	libwww_make_module_md5 \	175	#libwww_make_module_md5 \
175	libmd5 : force	176	#libmd5 : force
176	@(localdir=`pwd`; \	177	# @(localdir=`pwd`; \
177	cd $(LIBWWW)/modules/md5 ; \	178	# cd $(LIBWWW)/modules/md5 ; \
178	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \	179	# $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
179	CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \	180	# CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
180	libmd5.la)	181	# libmd5.la)
181		182	#
182	libwww_install_module_md5 : force	183	#libwww_install_module_md5 : force
183	@(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \	184	# @(if [ -e libmd5.a -a ! -L libmd5.a ] ; then \
184	$(RM) libmd5.a ; \	185	# $(RM) libmd5.a ; \
185	fi ; \	186	# fi ; \
186	if [ ! -L libmd5.a ] ; then \	187	# if [ ! -L libmd5.a ] ; then \
187	$(LN_S) $(LIBWWW)/modules/md5/.libs/libmd5.a ./libmd5.a ; \	188	# $(LN_S) $(LIBWWW)/modules/md5/.libs/libmd5.a ./libmd5.a ; \
188	fi)	189	# fi)
189		190	#
190	libwww_make_module_expat \	191	#libwww_make_module_expat \
191	libexpat : force	192	#libexpat : force
192	@(localdir=`pwd`; \
193	cd $(LIBWWW)/modules/expat/ ; \
194	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
195	CPPFLAGS="$(CPPFLAGS)" \
196	)
197
198	libwww_install_module_expat : force
199	@(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
200	$(RM) libexpat.a ; \
201	fi ; \
202	if [ ! -L libexpat.a ] ; then \
203	$(LN_S) $(LIBWWW)/modules/expat/.libs/libexpat.a ./libexpat.a ; \
204	fi)
205
206	#libwww_make_module_idn \
207	#libidn : force
208	# @(localdir=`pwd`; \	193	# @(localdir=`pwd`; \
209	# cd $(LIBWWW)/modules/idn/ ; \	194	# cd $(LIBWWW)/modules/expat/ ; \
210	# $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DLIBWWW_USEIDN" \	195	# $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
211	# CPPFLAGS="$(CPPFLAGS)" \	196	# CPPFLAGS="$(CPPFLAGS)" \
212	# )	197	# )
213		198	#
214	#libwww_install_module_idn : force	199	#libwww_install_module_expat : force
215	# @(if [ -e libidn.a -a ! -L libidn.a ] ; then \	200	# @(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
216	# $(RM) libidn.a ; \	201	# $(RM) libexpat.a ; \
217	# fi ; \	202	# fi ; \
218	# if [ ! -L libidn.a ] ; then \	203	# if [ ! -L libexpat.a ] ; then \
219	# $(LN_S) $(LIBWWW)/modules/idn/.libs/libidn.a ./libidn.a ; \	204	# $(LN_S) $(LIBWWW)/modules/expat/.libs/libexpat.a ./libexpat.a ; \
220	# fi)	205	# fi)
221		206	#
222	libwww_make_standard_libs \	207	##libwww_make_module_idn \
223	$(AMAYA_LIBWWW_STANDARD_LIBS) : force	208	##libidn : force
224	@(localdir=`pwd`; \	209	## @(localdir=`pwd`; \
225	all_libs="" ; \	210	## cd $(LIBWWW)/modules/idn/ ; \
226	for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \	211	## $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DLIBWWW_USEIDN" \
227	all_libs="$$all_libs $$lib.la" ; \	212	## CPPFLAGS="$(CPPFLAGS)" \
228	done ; \	213	## )
229	cd $(LIBWWW)/Library/src ; \	214	#
230	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \	215	##libwww_install_module_idn : force
231	CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \	216	## @(if [ -e libidn.a -a ! -L libidn.a ] ; then \
232	$$all_libs)	217	## $(RM) libidn.a ; \
233		218	## fi ; \
234	libwww_install_standard : force	219	## if [ ! -L libidn.a ] ; then \
235	@(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \	220	## $(LN_S) $(LIBWWW)/modules/idn/.libs/libidn.a ./libidn.a ; \
236	if [ -e $$lib.a -a ! -L $$lib.a ] ; then \	221	## fi)
237	$(RM) $$lib.a ; \	222	#
238	fi ; \	223	#libwww_make_standard_libs \
239	if [ ! -L $$lib.a ] ; then \	224	#$(AMAYA_LIBWWW_STANDARD_LIBS) : force
240	$(LN_S) $(LIBWWW)/Library/src/.libs/$$lib.a ./$$lib.a ; \	225	# @(localdir=`pwd`; \
241	fi ; \	226	# all_libs="" ; \
242	done)	227	# for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
243		228	# all_libs="$$all_libs $$lib.la" ; \
244	#libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat libwww_make_module_idn	229	# done ; \
245	libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat	230	# cd $(LIBWWW)/Library/src ; \
246	libwww_make : libwww_make_module_libs libwww_make_standard_libs	231	# $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS)" \
247	#libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat libwww_install_module_idn	232	# CPPFLAGS="$(CPPFLAGS) $(THOTINCLUDES) $(EXTRA_INCLUDES)" \
248	libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat	233	# $$all_libs)
249	libwww_install : libwww_install_modules libwww_install_standard	234	#
250		235	#libwww_install_standard : force
251	libwww : libwww_config libwww_make	236	# @(for lib in $(AMAYA_LIBWWW_STANDARD_LIBS) ; do \
252	@($(ECHO) "libwww is installed")	237	# if [ -e $$lib.a -a ! -L $$lib.a ] ; then \
		238	# $(RM) $$lib.a ; \
		239	# fi ; \
		240	# if [ ! -L $$lib.a ] ; then \
		241	# $(LN_S) $(LIBWWW)/Library/src/.libs/$$lib.a ./$$lib.a ; \
		242	# fi ; \
		243	# done)
		244	#
		245	##libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat libwww_make_module_idn
		246	#libwww_make_module_libs : libwww_make_module_md5 libwww_make_module_expat
		247	#libwww_make : libwww_make_module_libs libwww_make_standard_libs
		248	##libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat libwww_install_module_idn
		249	#libwww_install_modules : libwww_install_module_md5 libwww_install_module_expat
		250	#libwww_install : libwww_install_modules libwww_install_standard
		251	#
		252	#libwww : libwww_config libwww_make
		253	# @($(ECHO) "libwww is installed")
253		254
254	#	255	#
255	# Rules to build the raptor RDF library	256	# Rules to build the raptor RDF library
Lines 300-305 Link Here
300	rm -f ../TAGS	301	rm -f ../TAGS
301	find ../ -name "*.[hc]" -print \| xargs etags --declarations -a -o ../TAGS	302	find ../ -name "*.[hc]" -print \| xargs etags --declarations -a -o ../TAGS
302		303
		304	libwww:
		305	echo "make libwww: Not in gentoo"
		306
303	dummy:	307	dummy:
304		308
305		309

Lines 768-775 Link Here

(-)Amaya.orig/configure.in (-6 / +8 lines)
768	mkdir $BUILDRAPTOR	768	mkdir $BUILDRAPTOR
769	cd $BUILDRAPTOR &&	769	cd $BUILDRAPTOR &&
770	CC="$CC" CXX="$CXX" \	770	CC="$CC" CXX="$CXX" \
771	CPPFLAGS="-I$CURRENTPATH/../../libwww/modules/expat/lib" \	771	CPPFLAGS="-I/usr/include -I/usr/include/w3c-libwww" \
772	LDFLAGS="-L$CURRENTPATH/libwww/modules/expat -L$CURRENTPATH/libwww/modules/expat/.libs" \	772	LDFLAGS="-L$CURRENTPATH/libwww/modules/expat -L$CURRENTPATH/libwww/modules/expat/.libs" \
		773	/usr/lib \
773	../../../redland/raptor/configure \	774	../../../redland/raptor/configure \
774	--build=$build_alias --host=$host_alias --target=$target_alias \	775	--build=$build_alias --host=$host_alias --target=$target_alias \
775	--disable-shared \	776	--disable-shared \
Lines 878-888 Link Here
878		879
879		880
880	if test "$build_amaya" = "yes" ; then	881	if test "$build_amaya" = "yes" ; then
881	if test ! -f $srcdir/../libwww/Makefile.in ; then	882	dnl #this should be handled by arguments, breaks gentoo
882	AC_MSG_WARN(libwww sources not found !!)	883	dnl if test ! -f $srcdir/../libwww/Makefile.in ; then
883	AC_MSG_WARN(Disabling Amaya build !)	884	dnl AC_MSG_WARN(libwww sources not found !!)
884	build_amaya="no"	885	dnl AC_MSG_WARN(Disabling Amaya build !)
885	fi	886	dnl build_amaya="no"
		887	dnl fi
886		888
887	if test ! -f $srcdir/amaya/MathML.S ; then	889	if test ! -f $srcdir/amaya/MathML.S ; then
888	if test "$with_math" = "yes" ; then	890	if test "$with_math" = "yes" ; then

Lines 20-26 Link Here

(-)Amaya.orig/amaya/Makefile.libwww (-7 / +8 lines)
20		20
21	#MKP: added -lwwwdav	21	#MKP: added -lwwwdav
22	AMAYA_LIBWWW_LIBS= \	22	AMAYA_LIBWWW_LIBS= \
23	-L../$(LIBWWW)/Library/src/.libs \	23	-L/usr/lib \
24	$(LIBWWW_RDF_PARSER) \	24	$(LIBWWW_RDF_PARSER) \
25	-lwwwzip \	25	-lwwwzip \
26	-lwwwapp \	26	-lwwwapp \
Lines 36-53 Link Here
36	-lwwwcore \	36	-lwwwcore \
37	-lwwwutils \	37	-lwwwutils \
38	$(WWWDAV) \	38	$(WWWDAV) \
39	-L../$(LIBWWW)/modules/md5/.libs \
40	-lmd5 \	39	-lmd5 \
41	../$(LIBWWW)/modules/expat/.libs/libexpat.a	40	-L/usr/lib/libexpat.a
42	# -L../$(LIBWWW)/modules/expat/.libs \	41	# -L../$(LIBWWW)/modules/expat/.libs \
43	# -lexpat \	42	# -lexpat \
44		43
45	AMAYA_LIBWWW_EXTRA_LIBS=	44	AMAYA_LIBWWW_EXTRA_LIBS=
46		45
47	AMAYA_LIBWWW_INCLUDES= -I../libwww \	46	AMAYA_LIBWWW_INCLUDES= -I/usr/include -I/usr/include/w3c-libwww
48	-I$(THOTDIR)/../libwww/Library/src \	47
49	-I$(THOTDIR)../libwww/modules/md5 \	48	#AMAYA_LIBWWW_INCLUDES= -I../libwww \
50	-I$(THOTDIR)/../libwww/modules/expat/lib	49	# -I$(THOTDIR)/../libwww/Library/src \
		50	# -I$(THOTDIR)../libwww/modules/md5 \
		51	# -I$(THOTDIR)/../libwww/modules/expat/lib
51		52
52	# this dependency calls the ../Makefile rule that compiles libwww	53	# this dependency calls the ../Makefile rule that compiles libwww
53	AMAYA_LIBWWW_SRC= amaya_comp_libwww	54	AMAYA_LIBWWW_SRC= amaya_comp_libwww

Lines 13-22 Link Here

(-)Amaya.orig/davlib/Makefile.in (-7 / +6 lines)
13		13
14	INCLUDES =-DHAVE_CONFIG_H -I.. \	14	INCLUDES =-DHAVE_CONFIG_H -I.. \
15	-I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \	15	-I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
16	-I@top_srcdir@/amaya/f -I../libwww \	16	-I@top_srcdir@/amaya/f -I/usr/include/w3c-libwww \
17	-I@top_srcdir@/thotlib/include \	17	-I@top_srcdir@/thotlib/include \
18	-I@top_srcdir@/../libwww/Library/src \	18	-I/usr/include \
19	-I@top_srcdir@/../libwww/modules/expat/lib \	19	-I/usr/include/w3c-libwww \
20	-I$(DAVLIB)/tree/h -I$(DAVLIB)/h \	20	-I$(DAVLIB)/tree/h -I$(DAVLIB)/h \
21	$(GUI_INCLUDES)	21	$(GUI_INCLUDES)
22		22
Lines 58-65 Link Here
58		58
59	tree : list.o awstring.o awpair.o awnode.o awtree.o	59	tree : list.o awstring.o awpair.o awnode.o awtree.o
60		60
61	HTHome :	61	HTHome.o :
62	@(cd ../$(LIBWWW)/Library/src ; $(MAKE) HTHome.o)	62	@(echo "Not for gentoo v. HTHome.o")
63		63
64	clean :	64	clean :
65	$(RM) *.a	65	$(RM) *.a
Lines 108-115 Link Here
108	awnode.o \	108	awnode.o \
109	awstring.o \	109	awstring.o \
110	awpair.o \	110	awpair.o \
111	list.o \	111	list.o
112	../$(LIBWWW)/Library/src/HTHome.o
113		112
114	#	113	#
115	# dependencies	114	# dependencies