4.3.2 - minor configure and makefile tweaks...

In Amaya/configure.in:

...

AC_ARG_WITH(more-shared, [  --without-graphic-libs    doesn't use provided
libjpeg, libpng.])
if test "$with_graphic-libs" = "no" ; then
dnl
    AC_MSG_CHECKING([for libjpeg version = 6b])

...

Ummm... That ain't right.  This should probably read:

...

AC_ARG_WITH(graphic-libs, [  --without-graphic-libs    doesn't use provided
libjpeg, libpng.])
if test "$withval" = "no" ; then
dnl
    AC_MSG_CHECKING([for libjpeg version = 6b])

...

I patched it, ran it with this flag, it apparently worked:

mrsam@ny en-us]$ ldd /usr/bin/amaya
	libjpeg.so.62 => /usr/lib/libjpeg.so.62 (0x40022000)
	libpng.so.2 => /usr/lib/libpng.so.2 (0x40041000)
[ snip ]


Additionally, according to autoconf documentation, $withval should really
be tested inside a third argument to AC_ARG_WITH.  This will probably work
correctly forever, but...

Also, for some of the subdirectories, Amaya/Makefile.in resets CFLAGS to
-O, instead of propagating it down.  I'm not sure if there's a specific
reason for this.  I've been applying the following patch since 4.1, and
using -O2 with gcc.  I have not noticed any problems.


--- ../amaya.orig/Amaya/Makefile.in	Wed Feb 28 05:34:16 2001
+++ Amaya/Makefile.in	Wed Mar 14 19:09:46 2001
@@ -46,7 +46,7 @@

 tools: rebuild force
 	@(if test -d tools ; then cd tools ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="-O" all ; fi)
+	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" all ; fi)

 thotlib: rebuild force
 	@(if test -d thotlib ; then cd thotlib ; \
@@ -121,7 +121,7 @@
 # 	  cd $(THOTDIR)/classes ; $(MAKE) zips)

 tools/mkdep/mkdep :
-	@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O" mkdep)
+	@(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" mkdep)

 depend depends : rebuild tools/mkdep/mkdep
 	@(for dir in $(SUBDIRS) ;\
@@ -268,7 +268,7 @@

 libjpeg libjpeg.a : force
 	@($(RM) $(THOTDIR)/libjpeg/*.o)
-	@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="-O")
+	@(cd libjpeg ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)")

 #
 # Rules to rebuild the libpng package
@@ -276,7 +276,7 @@

 libpng libpng.a : force
 	@($(RM) $(THOTDIR)/libpng/*.o)
-	@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="-O")
+	@(cd libpng ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)")

 #
 # Rules to rebuild the libpng package
@@ -284,7 +284,7 @@

 libz libz.a : force
 	@($(RM) $(THOTDIR)/libpng/libz/*.o)
-	@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O")
+	@(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)")

 #
 # Rules to rebuild the Kaffe package

-- 
Sam

Received on Wednesday, 4 April 2001 03:42:15 UTC