[m-rev.] more bindist bug fixes

[Fergus Henderson]

Estimated hours taken: 0.75
Branches: main, release

bindist/bindist.configure.in:
	Fix some bugs:

	- invoke MERCURY_CHECK_LOCAL_C_LIB_DIRS.
	  This is needed to set @ALL_LOCAL_C_LIB_DIRS@ which
	  is reference in scripts/ml.in.

	- set CPPFLAGS after invoking MERCURY_CHECK_LOCAL_C_INCL_DIRS
	  (and set LIBS after invoking MERCURY_CHECK_LOCAL_C_LIB_DIRS).
	  This is needed so that the binary distribution's configure check for
	  GNU Readline will look in /usr/local/include and /usr/local/lib,
	  like the source distribution's configure check does.

configure.in:
	Add an XXX comment warning abou the code duplication
	between configure.in and bindist/bindist.build_vars.in.

Workspace: /home/ceres/fjh/mercury
Index: bindist/bindist.configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.configure.in,v
retrieving revision 1.45
diff -u -d -r1.45 bindist.configure.in
--- bindist/bindist.configure.in	4 Nov 2002 06:30:39 -0000	1.45
+++ bindist/bindist.configure.in	2 Dec 2002 08:11:54 -0000
@@ -3,6 +3,15 @@
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
 #-----------------------------------------------------------------------------#
+# bindist.configure.in:
+#	This file is an autoconf script which is used to create the
+#	configure script that gets included with the binary distribution.
+#
+# XXX Much of the code here is duplicated in ../configure.in.
+#     We should abstract it out into macros defined in ../aclocal.m4,
+#     so that the same code can be shared between both ../configure.in and 
+#     this file.
+#-----------------------------------------------------------------------------#
 #
 # Define a macro MERCURY_MSG, similar to AC_MSG_RESULT, for displaying output.
 #
@@ -206,8 +215,23 @@
 #-----------------------------------------------------------------------------#
 AC_PROG_CC
 MERCURY_CHECK_CC_NEEDS_TRAD_CPP
-MERCURY_CHECK_LOCAL_C_INCL_DIRS
 AC_SUBST(CC)
+#-----------------------------------------------------------------------------#
+# Make sure we search /usr/local/include and /usr/local/lib for
+# header files and libraries.  GNU C normally searches /usr/local/include
+# by default, but (inconsistently) on some systems, such as Solaris,
+# it does _not_ search /usr/local/lib.
+# The user might also be using a different C compiler that
+# doesn't search either of those by default.
+MERCURY_CHECK_LOCAL_C_INCL_DIRS
+CPPFLAGS="$ALL_LOCAL_C_INCL_DIRS $CPPFLAGS"
+MERCURY_CHECK_LOCAL_C_LIB_DIRS
+for dir in $ALL_LOCAL_C_LIB_DIRS kludge_for_broken_shells
+do
+        if test "$dir" != "kludge_for_broken_shells"; then
+                LIBS="-L$dir $LIBS"
+        fi
+done
 #-----------------------------------------------------------------------------#
 # Microsoft.NET configuration (the bindist may be installed on a machine
 # that supports .NET even if it was built on a machine that doesn't).
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.341
diff -u -d -r1.341 configure.in
--- configure.in	25 Nov 2002 11:53:16 -0000	1.341
+++ configure.in	2 Dec 2002 08:14:26 -0000
@@ -10,7 +10,12 @@
 # `configure' script.
 #
 # IMPORTANT NOTE: any changes here will usually also require changes in
-# bindist/bindist.configure.in or bindist/bindist.build_vars.in.
+# bindist/bindist.configure.in and/or bindist/bindist.build_vars.in.
+#
+# XXX Much of the code here is duplicated in bindist/bindist.configure.in.
+#     We should abstract it out into macros defined in aclocal.m4,
+#     so that the same code can be shared between both this file and
+#     bindist/bindist.configure.in.
 #
 #-----------------------------------------------------------------------------#
 #

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------