[m-rev.] trivial diff: improve support for x86 apple machines

[Julien Fischer]

Estimated bours taken: 0.5
Branches: main

configure.in:
 	Have configure correctly set up things on x86 based
 	Apple machines.

Julien.

Index: configure.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/configure.in,v
retrieving revision 1.482
diff -u -r1.482 configure.in
--- configure.in	22 Dec 2006 08:31:17 -0000	1.482
+++ configure.in	9 Jan 2007 11:20:07 -0000
@@ -604,7 +604,7 @@
  		# XXX We should probably check that the user isn't
  		# using GNU's hostname on OS X instead.
  		case "$host" in
-			powerpc*apple*darwin*)
+			*apple*darwin*)
  				HOSTNAMECMD="$HOSTNAMECMD" ;;
  			*)
  				HOSTNAMECMD="$HOSTNAMECMD -f" ;;
@@ -822,7 +822,7 @@
  	# don't get found during linking.  Whose !@#$ing idea was it to make
  	# that brain-damaged and non-standard-conforming mode the default?

-	case "$host" in *-apple-darwin*)
+	case "$host" in *apple*darwin*)
  		RANLIBFLAGS="-c"
  		;;
  	esac
@@ -2432,7 +2432,7 @@
  esac

  case "$host" in
-    powerpc*apple*darwin*)
+    *apple*darwin*)
          mercury_cv_default_cgi_dir=/Library/WebServer/CGI-Executables
          ;;
      *)
@@ -2565,12 +2565,7 @@
  		esac
  		;;

-	# Theoretically we should change this check to *apple*darwin*)
-	# as darwin should be the same whether or not we are on a powerpc or
-	# an i386, but since we don't have access to an i386 with darwin
-	# installed to test this, we currently restrict ourselves to the
-	# powerpc architecture.
-	*powerpc*apple*darwin*)
+	*apple*darwin*)
  		CFLAGS_FOR_THREADS="-DMR_THREAD_SAFE -DGC_DARWIN_THREADS"
  		THREAD_LIBS=""
  		;;
@@ -3570,7 +3565,7 @@
  		EXT_FOR_LINK_WITH_PIC_OBJECTS=o
  		DEFAULT_LINKAGE=static
  		;;
-	*powerpc*apple*darwin*)
+	*apple*darwin*)
  		# If the compiler is gcc then use darwin style dynamic linking.
  		# Otherwise use static linking.
  		if test "$GCC_PROG" != ""; then

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------