diff -uNr src.ORIG/config/MacOSX.cf src/config/MacOSX.cf
--- src.ORIG/config/MacOSX.cf	Thu Jul 17 15:18:16 2003
+++ src/config/MacOSX.cf	Thu Jul 17 16:30:44 2003
@@ -103,13 +103,15 @@
 
 #define ServerCDebugFlags -O -fPIC -g -pipe
 
+#ifndef HasGcc
 #define HasGcc YES
+#endif
 
 #undef CcCmd
 #undef CplusplusCmd
 #ifdef MacOSXArchitecture
-#define CcCmd cc -arch "ppc"
-#define CplusplusCmd          c++
+#define CcCmd cc -arch "ppc" -no-cpp-precomp
+#define CplusplusCmd          c++ -no-cpp-precomp
 #endif
 #ifndef CcCmd
 #define CcCmd cc
@@ -135,7 +137,7 @@
 				-DCERNLIB_PPC -DCERNLIB_QMGLIBC \
 				-DCERNLIB_MACOSX
 
-#define CERNLIB_SHIFT NO
+/* #define CERNLIB_SHIFT NO */
 #define CERNLIB_LINUX
 #define CERNLIB_UNIX
 #define CERNLIB_LNX
diff -uNr src.ORIG/pawlib/comis/code/csaddr.F src/pawlib/comis/code/csaddr.F
--- src.ORIG/pawlib/comis/code/csaddr.F	Tue Feb 27 02:16:25 1996
+++ src/pawlib/comis/code/csaddr.F	Tue Aug 12 20:03:41 2003
@@ -26,7 +26,11 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+#if defined(CERNLIB_MACOSX)
+          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
@@ -35,7 +39,11 @@
           ENDIF
         ENDIF
       ELSE
+#if defined(CERNLIB_MACOSX)
+        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2
diff -uNr src.ORIG/pawlib/comis/code/cscrexec.F src/pawlib/comis/code/cscrexec.F
--- src.ORIG/pawlib/comis/code/cscrexec.F	Mon Sep 25 23:16:36 2000
+++ src/pawlib/comis/code/cscrexec.F	Sun Aug 17 16:07:28 2003
@@ -175,8 +175,13 @@
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
       ENDIF
 #endif
-#if defined(CERNLIB_LINUX)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX)
       CHLINE=                   'ld -shared -o '
+     +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
+#endif
+#if defined(CERNLIB_MACOSX)
+      CHLINE= 'g77 -bundle -bundle_loader `/usr/bin/which pawX11` '
+     +                    // ' -bind_at_load -o '
      +                    // NAME(:LN) //'.sl '// NAME(:LN) //'.o'
 #endif
 #if defined(CERNLIB_ALPHA_OSF)