mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-11 03:45:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix some bugs:

Browse Source 
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.
This commit is contained in:
Fergus Henderson
2002-12-02 08:27:58 +00:00
parent fdbbfe680d
commit e0e59586b4
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bindist/bindist.configure.in
View File

@@ -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,9 +215,24 @@ AC_SUBST(AS)
#-----------------------------------------------------------------------------#
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).
#

7
configure.in
View File

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