diff -ruN ns-allinone-2.1b9/cweb/Makefile ns-allinone-2.1b9-osx/cweb/Makefile --- ns-allinone-2.1b9/cweb/Makefile Tue Jun 5 00:50:28 2001 +++ ns-allinone-2.1b9-osx/cweb/Makefile Tue Jul 9 09:09:27 2002 @@ -56,7 +56,7 @@ #LINKFLAGS = -s # for smaller (stripped) executables on many UNIX systems # What C compiler are you using? -CC = gcc +CC = cc # RM and CP are used below in case rm and cp are aliased RM= /bin/rm diff -ruN ns-allinone-2.1b9/gt-itm/sgb2ns/Makefile ns-allinone-2.1b9-osx/gt-itm/sgb2ns/Makefile --- ns-allinone-2.1b9/gt-itm/sgb2ns/Makefile Tue Jun 5 00:53:33 2001 +++ ns-allinone-2.1b9-osx/gt-itm/sgb2ns/Makefile Tue Jul 9 09:14:00 2002 @@ -16,7 +16,7 @@ BDIR = $(GT_ITM)/bin CFLAGS = -I$(IDIR) -L$(LDIR) $(SYS) -CC = gcc +CC = cc CN = sgb2ns.o HN = sgb2hierns.o diff -ruN ns-allinone-2.1b9/gt-itm/src/Makefile ns-allinone-2.1b9-osx/gt-itm/src/Makefile --- ns-allinone-2.1b9/gt-itm/src/Makefile Tue Jun 5 00:53:33 2001 +++ ns-allinone-2.1b9-osx/gt-itm/src/Makefile Tue Jul 9 09:13:40 2002 @@ -17,7 +17,7 @@ BDIR = ../bin CFLAGS = -I$(IDIR) -L$(LDIR) $(SYS) $(BSDF) -CC = gcc +CC = cc GO = itm.o geog.o ts.o dfs.o CO = sgb2alt.o @@ -56,7 +56,7 @@ eval.o: $(IDIR)/gb_graph.h $(IDIR)/gb_dijk.h $(IDIR)/eval.h - + clean: \rm -f *.o diff -ruN ns-allinone-2.1b9/install ns-allinone-2.1b9-osx/install --- ns-allinone-2.1b9/install Tue Apr 23 01:42:09 2002 +++ ns-allinone-2.1b9-osx/install Tue Jul 9 09:13:05 2002 @@ -183,7 +183,7 @@ blame='Tcl is not part of the ns project. Please see www.Scriptics.com to see if they have a fix for your platform.' -./configure --enable-gcc --disable-shared --prefix=$CUR_PATH || die "tcl8.3.2 configuration failed! Exiting ..." +./configure --disable-shared --prefix=$CUR_PATH || die "tcl8.3.2 configuration failed! Exiting ..." if make then echo "tcl$TCLVER make succeeded." @@ -211,7 +211,7 @@ blame='Tk is not part of the ns project. Please see www.Scriptics.com to see if they have a fix for your platform.' -./configure --enable-gcc --disable-shared --prefix=$CUR_PATH || die "tk8.3.2 configuration failed! Exiting ..." +./configure --disable-shared --prefix=$CUR_PATH || die "tk8.3.2 configuration failed! Exiting ..." if make then echo "tk$TKVER build succeeded." diff -ruN ns-allinone-2.1b9/nam-1.0a11/config.sub ns-allinone-2.1b9-osx/nam-1.0a11/config.sub --- ns-allinone-2.1b9/nam-1.0a11/config.sub Mon Apr 15 22:18:52 2002 +++ ns-allinone-2.1b9-osx/nam-1.0a11/config.sub Mon Jul 8 20:58:16 2002 @@ -750,6 +750,8 @@ -xenix) os=-xenix ;; + -darwin*) + ;; -none) ;; *) diff -ruN ns-allinone-2.1b9/ns-2.1b9/Makefile.in ns-allinone-2.1b9-osx/ns-2.1b9/Makefile.in --- ns-allinone-2.1b9/ns-2.1b9/Makefile.in Mon Mar 18 22:39:26 2002 +++ ns-allinone-2.1b9-osx/ns-2.1b9/Makefile.in Mon Jul 8 21:08:59 2002 @@ -272,22 +272,28 @@ OBJ_COMPAT = $(OBJ_GETOPT) common/win32.o #XXX compat/win32x.o compat/tkConsole.o -OBJ_EMULATE_CC = \ - emulate/net-ip.o \ - emulate/net.o \ - emulate/tap.o \ - emulate/ether.o \ - emulate/internet.o \ - emulate/ping_responder.o \ - emulate/arp.o \ - emulate/icmp.o \ - emulate/net-pcap.o \ - emulate/nat.o \ - emulate/iptap.o \ - emulate/tcptap.o -OBJ_EMULATE_C = \ - emulate/inet.o + +#OBJ_EMULATE_CC = \ +# emulate/net-ip.o \ +# emulate/net.o \ +# emulate/tap.o \ +# emulate/ether.o \ +# emulate/internet.o \ +# emulate/ping_responder.o \ +# emulate/arp.o \ +# emulate/icmp.o \ +# emulate/net-pcap.o \ +# emulate/nat.o \ +# emulate/iptap.o \ +# emulate/tcptap.o + +#OBJ_EMULATE_C = \ +# emulate/inet.o + +# hack to remove emulate code which doesn't compile on darwin +OBJ_EMULATE_CC = +OBJ_EMULATE_C = OBJ_GEN = $(GEN_DIR)version.o $(GEN_DIR)ns_tcl.o $(GEN_DIR)ptypes.o diff -ruN ns-allinone-2.1b9/ns-2.1b9/config.sub ns-allinone-2.1b9-osx/ns-2.1b9/config.sub --- ns-allinone-2.1b9/ns-2.1b9/config.sub Wed Jan 20 01:44:25 1999 +++ ns-allinone-2.1b9-osx/ns-2.1b9/config.sub Mon Jul 8 20:57:40 2002 @@ -750,6 +750,8 @@ -xenix) os=-xenix ;; + -darwin*) + ;; -none) ;; *)