  
  	[ "${ACC_ENABLE_OPENMP}" == "Y" ] && CONFIG_OPTIONS="--enable-openmp"
 diff --git a/tao/cmake.tao b/tao/cmake.tao
-index 333fd3f..502007a 100644
+index 333fd3f..ae8cff4 100644
 --- a/tao/cmake.tao
 +++ b/tao/cmake.tao
 @@ -29,6 +29,13 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

diff --git a/bmad/CMakeLists.txt b/bmad/CMakeLists.txt
index 7422aee..e7e65f6 100644
--- a/bmad/CMakeLists.txt
+++ b/bmad/CMakeLists.txt
@@ -7,8 +7,17 @@ SET (CREATE_SHARED true)

--- a/util/dist_source_me
+++ b/util/dist_source_me
@@ -68,15 +68,6 @@ func_set_os_env () {
 	    fi
 	fi
     fi
-
-    # For Mac OS X "Darwin"
-    if [ "$(uname)" == "Darwin" ] ; then
-	# Force MacPorts gcc/g++ as GNU compiler
-	if [ -e /opt/local/bin/gcc ] ; then
-	    export CC=gcc
-	    export CXX=g++
-	fi
-    fi
 }
 
 
@@ -358,17 +349,6 @@ func_add_bmad_path () {
 
     else
 	export LD_LIBRARY_PATH=${BMAD_LIB_PROD_PATH}:${BMAD_LIB_DEBUG_PATH}
-
-        # Configure DYLD_LIBRARY_PATH for Mac OS X
-	if [ "${DIST_OS}" == "Darwin" ] ; then
-
-	    if ( [ "${DIST_F90_REQUEST}" == "ifort" ] && [ -d /opt/intel/lib ] ) ; then
-		export DYLD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/lib
-
-	    elif [ -d /opt/local/lib ] ; then
-	     	export DYLD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-	    fi
-	fi
     fi
 }
 
@@ -394,7 +374,7 @@ func_add_bmad_path () {
 # Set universal ACC_ROOT_DIR variable. Defined for both 
 # Release and Distribution Builds.
 #-----------------------------------------------------------------
-DIST_SETUP_LOG=${HOME}/.Bmad_Dist_Setup_Log.tmp
