--- jabber-1.4.2/configure.org	Mon Feb 11 13:14:06 2002
+++ jabber-1.4.2/configure	Tue Apr 30 19:43:16 2002
@@ -27,12 +27,20 @@
 else
     CC="gcc";
 fi;
-CFLAGS="$CFLAGS -g -Wall -I. -I.."
-MCFLAGS="$MCFLAGS -shared"
+
+if [ "$CC" = "gcc" ]; then
+  CFLAGS="$CFLAGS -g -Wall -I. -I.."
+  MCFLAGS="$MCFLAGS -shared"
+else
+  CFLAGS="$CFLAGS -I. -I.."
+  MCFLAGS="$MCFLAGS"
+fi
+
 LDFLAGS="$LDFLAGS"
 LIBS="$LIBS"
 XLDFLAGS="$XLDFLAGS "
-JHOME=`pwd`
+# Set JHOME to `pwd` only if not already set
+[ ! -n "$JHOME" ] && JHOME=`pwd`
 
 ##
 # Print a cool header
@@ -146,8 +154,9 @@
 _pool_new
 _pool_new_heap
 EOF
-CFLAGS="$CFLAGS -fPIC -DMAXDNAME=1025"
-MCFLAGS="$MCFLAGS -Wl,-G"
+CFLAGS="$CFLAGS -DMAXDNAME=1025"
+[[ "$CC" = "gcc" ]] && CFLAGS="$CFLAGS -fPIC"
+MCFLAGS="$MCFLAGS -Wl,-G,-bexpall"
 XLDFLAGS="$XLDFLAGS -Wl,-brtl,-bexpall,-bE:jabberd.exp";;
 
 esac