[patch] the patch to clean up most of the Makefile.in and configure.in problems.

amaya-10.1_pre5-autoconf-gentoo.patch (text/plain), 12.93 KB, created by Matthew Gregory Sr. on 2008-11-16 09:31:52 UTC

diff -urN Amaya.orig/Makefile.in Amaya/Makefile.in
--- Amaya.orig/Makefile.in	2008-11-15 23:08:03.000000000 -0500
+++ Amaya/Makefile.in	2008-11-16 02:41:49.000000000 -0500
@@ -129,127 +129,128 @@
 # 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
+#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/idn/ ; \
-#		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DLIBWWW_USEIDN" \
+#		  cd $(LIBWWW)/modules/expat/ ; \
+#		  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXPAT_OPTIONS) -DXML_AMAYA" \
 #		  CPPFLAGS="$(CPPFLAGS)" \
 #	        	    )
-
-#libwww_install_module_idn : force
-#		@(if [ -e libidn.a -a ! -L libidn.a ] ; then \
-#			$(RM) libidn.a ; \
+#
+#libwww_install_module_expat : force
+#		@(if [ -e libexpat.a -a ! -L libexpat.a ] ; then \
+#			$(RM) libexpat.a ; \
 #		  fi ; \
-#		  if [ ! -L libidn.a ] ; then \
-#			$(LN_S) $(LIBWWW)/modules/idn/.libs/libidn.a ./libidn.a ; \
+#		  if [ ! -L libexpat.a ] ; then \
+#			$(LN_S) $(LIBWWW)/modules/expat/.libs/libexpat.a ./libexpat.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")
+#
+##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
@@ -300,6 +301,9 @@
 	rm -f ../TAGS
 	find ../ -name "*.[hc]" -print | xargs etags --declarations -a -o ../TAGS
 
+libwww:
+	echo "make libwww: Not in gentoo"
+
 dummy:
 
 
diff -urN Amaya.orig/amaya/Makefile.libwww Amaya/amaya/Makefile.libwww
--- Amaya.orig/amaya/Makefile.libwww	2008-11-15 23:08:03.000000000 -0500
+++ Amaya/amaya/Makefile.libwww	2008-11-16 04:14:51.000000000 -0500
@@ -20,7 +20,7 @@
 
 #MKP: added -lwwwdav
 AMAYA_LIBWWW_LIBS= \
-		-L../$(LIBWWW)/Library/src/.libs \
+			-L/usr/lib \
 			$(LIBWWW_RDF_PARSER) \
 			-lwwwzip \
 			-lwwwapp \
@@ -36,18 +36,19 @@
 			-lwwwcore \
 			-lwwwutils \
 			$(WWWDAV) \
-		-L../$(LIBWWW)/modules/md5/.libs \
 			-lmd5 \
-			../$(LIBWWW)/modules/expat/.libs/libexpat.a
+			-L/usr/lib/libexpat.a
 #		-L../$(LIBWWW)/modules/expat/.libs \
 #			-lexpat \
 
 AMAYA_LIBWWW_EXTRA_LIBS=
 
-AMAYA_LIBWWW_INCLUDES= -I../libwww \
-		-I$(THOTDIR)/../libwww/Library/src \
-		-I$(THOTDIR)../libwww/modules/md5 \
-		-I$(THOTDIR)/../libwww/modules/expat/lib
+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
diff -urN Amaya.orig/annotlib/Makefile.in Amaya/annotlib/Makefile.in
--- Amaya.orig/annotlib/Makefile.in	2008-11-15 23:08:03.000000000 -0500
+++ Amaya/annotlib/Makefile.in	2008-11-16 03:21:01.000000000 -0500
@@ -14,9 +14,8 @@
 
 INCLUDES= -DHAVE_CONFIG_H -DANNOTATIONS \
 	  -I.. -I../amaya  -I@srcdir@/f -I@top_srcdir@/amaya \
-	  -I@top_srcdir@/amaya/f -I../libwww \
-	  -I@top_srcdir@/../libwww/Library/src \
-	  -I@top_srcdir@/../libwww/modules/expat/lib \
+	  -I@top_srcdir@/amaya/f  \
+	  -I/usr/include/w3c-libwww
 	   @AMAYA_RAPTOR_INCLUDES@ @THOTINCLUDES@ $(GUI_INCLUDES)
 
 
diff -urN Amaya.orig/configure.in Amaya/configure.in
--- Amaya.orig/configure.in	2008-11-15 23:08:03.000000000 -0500
+++ Amaya/configure.in	2008-11-16 03:25:11.000000000 -0500
@@ -768,8 +768,9 @@
 		mkdir $BUILDRAPTOR
 		cd $BUILDRAPTOR &&
 			CC="$CC" CXX="$CXX" \
-			CPPFLAGS="-I$CURRENTPATH/../../libwww/modules/expat/lib" \
+			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 \
@@ -878,11 +879,12 @@
 
 
 if test "$build_amaya" = "yes" ; then
-    if test ! -f $srcdir/../libwww/Makefile.in ; then
-	AC_MSG_WARN(libwww sources not found !!)
-	AC_MSG_WARN(Disabling Amaya build !)
-	build_amaya="no"
-    fi
+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
diff -urN Amaya.orig/davlib/Makefile.dav Amaya/davlib/Makefile.dav
--- Amaya.orig/davlib/Makefile.dav	2008-11-15 23:08:03.000000000 -0500
+++ Amaya/davlib/Makefile.dav	2008-11-16 04:07:19.000000000 -0500
@@ -8,7 +8,7 @@
 
 AMAYA_DAV_INCLUDES=-I$(THOTDIR)/davlib/h -I$(THOTDIR)/davlib/tree/h -I$(THOTDIR)/davlib/f
 
-AMAYA_DAV_OBJ= ../libwww/Library/src/HTHome.o 
+#AMAYA_DAV_OBJ= ../libwww/Library/src/HTHome.o 
 
 AMAYA_DAV_SRC= ../davlib/davlib.a 
 
diff -urN Amaya.orig/davlib/Makefile.in Amaya/davlib/Makefile.in
--- Amaya.orig/davlib/Makefile.in	2008-11-15 23:08:03.000000000 -0500
+++ Amaya/davlib/Makefile.in	2008-11-16 04:02:40.000000000 -0500
@@ -13,10 +13,10 @@
 
 INCLUDES =-DHAVE_CONFIG_H -I.. \
 	  -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
-	  -I@top_srcdir@/amaya/f -I../libwww \
+	  -I@top_srcdir@/amaya/f -I/usr/include/w3c-libwww \
 	  -I@top_srcdir@/thotlib/include \
-	  -I@top_srcdir@/../libwww/Library/src \
-	  -I@top_srcdir@/../libwww/modules/expat/lib \
+	  -I/usr/include \
+	  -I/usr/include/w3c-libwww \
 	  -I$(DAVLIB)/tree/h -I$(DAVLIB)/h \
 	  $(GUI_INCLUDES)
 
@@ -58,8 +58,8 @@
 
 tree : list.o awstring.o awpair.o awnode.o awtree.o
 
-HTHome :
-	@(cd ../$(LIBWWW)/Library/src ; $(MAKE) HTHome.o)
+HTHome.o :
+	@(echo "Not for gentoo v. HTHome.o")
 
 clean :
 	$(RM) *.a
@@ -108,8 +108,7 @@
 	awnode.o \
 	awstring.o \
 	awpair.o \
-	list.o \
-	../$(LIBWWW)/Library/src/HTHome.o
+	list.o 
 
 #
 # dependencies
diff -urN Amaya.orig/tools/mkdep/Makefile.in Amaya/tools/mkdep/Makefile.in
--- Amaya.orig/tools/mkdep/Makefile.in	2008-11-15 23:08:03.000000000 -0500
+++ Amaya/tools/mkdep/Makefile.in	2008-11-16 03:21:49.000000000 -0500
@@ -28,7 +28,7 @@
 uninstall :
 
 test: all
-	./mkdep -I../../../libwww/Library/src \
+	./mkdep -I/usr/include/w3c-libwww \
 	        -I../../../thotlib/internals/h \
 		-I../../../thotlib/internals/var \
 		-I../../../thotlib/internals/f \