diff -urN miriad-pre-10.3/borrow/pgplot/sys_macosx/g77_cc.conf miriad/borrow/pgplot/sys_macosx/g77_cc.conf --- miriad-pre-10.3/borrow/pgplot/sys_macosx/g77_cc.conf Sat Feb 21 00:33:38 2004 +++ miriad/borrow/pgplot/sys_macosx/g77_cc.conf Sat Feb 21 00:36:21 2004 @@ -74,7 +74,7 @@ # The library-specification flags to use when linking normal pgplot # demo programs. - LIBS="-L/usr/X11R6/lib -lX11 -lm -framework Foundation -framework AppKit" + LIBS="-L/usr/X11R6/lib -lX11 -lm -lcc_dynamic -Wl,-framework -Wl,Foundation -Wl,-framework -Wl,AppKit" # Optional: Needed by XMDRIV (/xmotif). diff -urN miriad-pre-10.3/borrow/wip/makewip miriad/borrow/wip/makewip --- miriad-pre-10.3/borrow/wip/makewip Sat Feb 21 00:34:38 2004 +++ miriad/borrow/wip/makewip Sat Feb 21 00:35:42 2004 @@ -565,7 +565,7 @@ else if ("$wiphost" == 'darwin') then set doranlib = 1 set doliblm = 1 - set f77lib = ( $f77lib -lg2c ) + set f77lib = ( $f77lib -lg2c -lcc_dynamic ) set theM = "$fcname" if ($dodebug > 0) then set theM = "$theM -g" @@ -619,7 +619,7 @@ # if (`echo ${ccname} | grep -c "gcc"` > 0) then set doliblm = 1 - if ("$wiphost" != 'darwin') set f77lib = ( $f77lib -lgcc ) + if ("$wiphost" != 'darwin') set f77lib = ( $f77lib -lgcc -lcc_dynamic ) if (`echo ${ccname} ${cFlags} | grep -c "ansi"` < 1) then echo '### The gcc compiler should be called with the -ansi flag.' endif diff -urN miriad-pre-10.3/src/sys/bin/compile.darwin miriad/src/sys/bin/compile.darwin --- miriad-pre-10.3/src/sys/bin/compile.darwin Sat Feb 21 00:34:38 2004 +++ miriad/src/sys/bin/compile.darwin Sat Feb 21 00:35:42 2004 @@ -13,14 +13,14 @@ setenv Foptions "-O -fno-globals -fno-common" setenv FoptionsN "-fno-globals" setenv Flinkdir "-L`echo $mmir/lib/$mhost $MIRXLIB | sed 's/ / -L/g'`" -setenv Flinklib "-lmir -llinpack -lpgplot -lX11 -lm -framework Foundation -framework AppKit" +setenv Flinklib "-lmir -llinpack -lpgplot -lX11 -lm -lcc_dynamic -Wl,-framework -Wl,Foundation -Wl,-framework -Wl,AppKit" setenv Finclude "-I`echo $mmir/src/inc $MIRXINC | sed 's/ / -I/g'`" # the gnu compiler actually adds -Dlinux, so we don't need it here setenv Ccompile "cc" setenv Coptions "-O -fno-common -DWORDS_BIGENDIAN -Ddarwin" setenv CoptionsN "-DWORDS_BIGENDIAN -Ddarwin" setenv Clinkdir "-L`echo $mmir/lib/$mhost $MIRXLIB | sed 's/ / -L/g'`" -setenv Clinklib "-lmir -llinpack -lpgplot -lX11 -lf2c -lm -framework Foundation -framework AppKit" +setenv Clinklib "-lmir -llinpack -lpgplot -lX11 -lf2c -lm -lcc_dynamic -Wl,-framework -Wl,Foundation -Wl,-framework -Wl,AppKit" setenv Cinclude "-I`echo $mmir/src/inc $mhost | sed 's/ / -I/g'`" # setenv Ratty "$mmir/bin/$mhost/ratty -s f2c -b -D linux"