[m-rev.] diff: some preliminary support for deep profiling on OS X

[Julien Fischer]

Estimated hours taken: 1
Branches: main

Add some preliminary support for deep profiling on OS X.
The following diff is enough to get a web browser talking
to the mdprof_cgi script on a machine running OS X
(assuming that the web server is actually running).

configure.in:
	Add some preliminary support for deep profiling on OS X.
	By default we now install the deep profiler on system
	that use OS X.

Julien.

Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.405
diff -u -r1.405 configure.in
--- configure.in	19 Oct 2004 06:01:35 -0000	1.405
+++ configure.in	29 Oct 2004 17:47:46 -0000
@@ -498,7 +498,19 @@
 #-----------------------------------------------------------------------------#
 AC_PATH_PROG(HOSTNAMECMD,hostname uname)
 case "$HOSTNAMECMD" in
-	*hostname)	HOSTNAMECMD="$HOSTNAMECMD -f" ;;
+	*hostname)
+		# OS X uses BSD's hostname command which outputs
+		# the fully qualified domain name by default. It
+		# doesn't have a `-f' flag.
+		# XXX We should probably check that the user isn't
+		# using GNU's hostname on OS X instead.
+		case "$host" in
+			powerpc*apple*darwin*)
+				HOSTNAMECMD="$HOSTNAMECMD" ;;
+			*)
+				HOSTNAMECMD="$HOSTNAMECMD -f" ;;
+		esac
+		;;
 esac
 AC_DEFINE_UNQUOTED(MR_HOSTNAMECMD, "$HOSTNAMECMD")
 #-----------------------------------------------------------------------------#
@@ -2207,7 +2219,15 @@
     esac ;;
 esac

-mercury_cv_default_cgi_dir=/usr/lib/cgi-bin
+case "$host" in
+    powerpc*apple*darwin*)
+        mercury_cv_default_cgi_dir=/Library/WebServer/CGI-Executables
+        ;;
+    *)
+        mercury_cv_default_cgi_dir=/usr/lib/cgi-bin
+        ;;
+esac
+
 case $enable_deep_profiler in
 	default)
 		if test -d $mercury_cv_default_cgi_dir; then


--------------------------------------------------------------------------
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
--------------------------------------------------------------------------