[m-dev.] diff: fix bugs in binary distribution

[Fergus Henderson]

Estimated hours taken: 1

Fix bugs that broke debugging and shared libraries in the
binary distribution.

bindist/bindist.build_vars.in:
bindist/bindist.configure.in:
	Pass down the following variables from the source configure
	to the bindist configure: ALLOW_UNDEFINED, ERROR_UNDEFINED,
	DL_LIBRARY, SOCKET_LIBRARY, NSL_LIBRARY.

bindist/bindist.configure.in:
	Delete the old code for autoconfiguration of the -lsocket
	and -lnsl libraries; this is now handled by passing down
	the variables from the source build.

configure.in:
bindist/bindist.configure.in:
	Fix a bug: use AC_SUBST(AS) rather than AC_DEFINE(AS).
	(This bug was probably harmless because AC_PATH_PROG(AS)
	already does an AC_SUBST(AS).)

Workspace: /d-drive/home/hg/fjh/mercury
Index: bindist/bindist.build_vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.build_vars.in,v
retrieving revision 1.9
diff -u -d -r1.9 bindist.build_vars.in
--- bindist/bindist.build_vars.in	1998/11/26 18:31:23	1.9
+++ bindist/bindist.build_vars.in	1999/11/23 06:20:38
@@ -30,3 +30,8 @@
 SHARED_LIBS='@SHARED_LIBS@'
 HAVE_DELAY_SLOT="@HAVE_DELAY_SLOT@"
 DEFAULT_RM_C="@DEFAULT_RM_C@"
+ERROR_UNDEFINED="@ERROR_UNDEFINED@"
+ALLOW_UNDEFINED="@ALLOW_UNDEFINED@"
+DL_LIBRARY="@DL_LIBRARY@"
+SOCKET_LIBRARY="@SOCKET_LIBRARY@"
+NSL_LIBRARY="@NSL_LIBRARY@"
Index: bindist/bindist.configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/bindist.configure.in,v
retrieving revision 1.24
diff -u -d -r1.24 bindist.configure.in
--- bindist/bindist.configure.in	1999/03/30 05:45:29	1.24
+++ bindist/bindist.configure.in	1999/11/23 06:20:15
@@ -60,6 +60,11 @@
 AC_SUBST(SHARED_LIBS)
 AC_SUBST(HAVE_DELAY_SLOT)
 AC_SUBST(DEFAULT_RM_C)
+AC_SUBST(ALLOW_UNDEFINED)
+AC_SUBST(ERROR_UNDEFINED)
+AC_SUBST(DL_LIBRARY)
+AC_SUBST(SOCKET_LIBRARY)
+AC_SUBST(NSL_LIBRARY)
 
 #-----------------------------------------------------------------------------#
 AC_PROG_RANLIB
@@ -170,7 +175,7 @@
 fi
 ])
 AC_MSG_RESULT($mercury_cv_asm_does_full_preprocessing)	
-AC_DEFINE(AS)
+AC_SUBST(AS)
 #-----------------------------------------------------------------------------#
 AC_PROG_CC
 AC_SUBST(CC)
@@ -186,43 +191,6 @@
 AC_SUBST_FILE(INIT_GRADE_OPTIONS)
 AC_SUBST_FILE(PARSE_GRADE_OPTIONS)
 AC_SUBST_FILE(FINAL_GRADE_OPTIONS)
-
-#-----------------------------------------------------------------------------#
-
-AC_MSG_CHECKING(whether we can use sockets (for Opium-M))
-# test if sockets are available to be able to use Opium-M
-# XXX It would be better to use AC_TRY_RUN() to do that
-
-SOCKET_LIBRARY=
-
-case "$host" in
-	i?86-*-linux|i?86-*-linux-gnu)
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(MR_USE_EXTERNAL_DEBUGGER)
-		;;
-	m68*-linux|m68*-linux-gnu)
-		AC_MSG_RESULT(disabled for now because it is untested)
-		;;
-	i?86-*-freebsd*)
-		AC_MSG_RESULT(disabled for now because it is untested)
-		;;
-	sparc-sun-solaris2.*)
-		AC_MSG_RESULT(yes)        
-		AC_DEFINE(MR_USE_EXTERNAL_DEBUGGER)
-		SOCKET_LIBRARY=" -lsocket"
-		;;
-	alpha-dec-osf*)
-		AC_MSG_RESULT(disabled for now because it is untested)
-		;;
-	*-cygwin*)
-		AC_MSG_RESULT(disabled for now because it is untested)
-		;;
-	*)
-		AC_MSG_RESULT(unknown system, assuming no)
-		;;
-esac
-
-AC_SUBST(SOCKET_LIBRARY)
 
 #-----------------------------------------------------------------------------#
 MERCURY_CHECK_READLINE
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.190
diff -u -d -r1.190 configure.in
--- configure.in	1999/11/16 07:51:07	1.190
+++ configure.in	1999/11/23 06:10:39
@@ -1799,7 +1799,7 @@
 fi
 ])
 AC_MSG_RESULT($mercury_cv_asm_does_full_preprocessing)	
-AC_DEFINE(AS)
+AC_SUBST(AS)
 #-----------------------------------------------------------------------------#
 AC_MSG_CHECKING(whether structure assignment conflicts with global registers)
 AC_CACHE_VAL(mercury_cv_cannot_use_structure_assignment,

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------