- make sure to include $(CPPFLAGS) when compiling gsm files

- make it compile on solaris

3 files changed, 55 insertions, 14 deletions

diff --git a/mbone/vat/files/patch-sum b/mbone/vat/files/patch-sum
index e956e1eddc6..d9dd2e7e83b 100644
--- a/mbone/vat/files/patch-sum
+++ b/mbone/vat/files/patch-sum
@@ -1,12 +1,12 @@
-$NetBSD: patch-sum,v 1.3 2000/01/26 22:14:25 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/03/13 13:17:14 bouyer Exp $
 
 MD5 (patch-aa) = adbc86533f716bcac29ffc312e8518f1
 MD5 (patch-ab) = f43d163bafd5a5cce7911643306df48a
 MD5 (patch-ac) = 3e6a6054afe4f4cb94803428f52d0253
 MD5 (patch-ad) = 061830188d2189942d45fb7d15d7f29c
-MD5 (patch-af) = 9c2f9ad852afae00ba1fcad4f3af214a
+MD5 (patch-af) = 83017a8c24ca0cea0f97473d5d36a6c2
 MD5 (patch-ag) = b716809fe747bf21c0a422d42f079810
 MD5 (patch-ah) = c3eca24423b09721cc93a63c885ae7f2
 MD5 (patch-ai) = ec5faaebd35a8dc0cb49dae09ef12746
 MD5 (patch-aj) = 8a785a1447ec2c6d76d041fe004eeff3
-MD5 (patch-ak) = dbbcb038a8433e6f2e80f221058ddc59
+MD5 (patch-ak) = 07aef0808710e7b8cd4d40abf50862c6
diff --git a/mbone/vat/patches/patch-af b/mbone/vat/patches/patch-af
index 1dee7a93d57..4aa98005dcf 100644
--- a/mbone/vat/patches/patch-af
+++ b/mbone/vat/patches/patch-af
@@ -1,22 +1,37 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:10:04 agc Exp $
+$NetBSD: patch-af,v 1.3 2000/03/13 13:17:15 bouyer Exp $
 
---- config.h.freebsd	Thu May 16 14:27:06 1996
-+++ config.h	Thu Nov 20 13:35:24 1997
-@@ -36,7 +36,7 @@
+--- config.h.orig	Thu May 16 14:27:06 1996
++++ config.h	Mon Mar 13 12:10:22 2000
+@@ -36,8 +36,13 @@
  #ifndef vic_config_h
  #define vic_config_h
  
 -#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__)
-+#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__svr4__)
  #include <sys/types.h>
++#if defined(__svr4__)
++typedef uint8_t u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++#endif
  #elif defined(linux)
  #include <sys/bitypes.h>
-@@ -83,7 +83,7 @@
+ #else
+@@ -57,7 +62,7 @@
+ typedef int int32_t;
+ #endif
+ 
+-#if defined(sun)||defined(_AIX)
++#if defined(_AIX)
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+@@ -83,7 +88,7 @@
  #include <arpa/inet.h>
  int strcasecmp(const char *, const char *);
  clock_t clock(void);
 -#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__)
-+#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__svr4__)
  int gethostid(void);
  #endif
  time_t time(time_t *);
diff --git a/mbone/vat/patches/patch-ak b/mbone/vat/patches/patch-ak
index de2a69bf7e3..5c38ce71eb1 100644
--- a/mbone/vat/patches/patch-ak
+++ b/mbone/vat/patches/patch-ak
@@ -1,8 +1,34 @@
-$NetBSD: patch-ak,v 1.1 2000/01/26 22:14:27 jlam Exp $
+$NetBSD: patch-ak,v 1.2 2000/03/13 13:17:16 bouyer Exp $
 
---- Makefile.in.orig	Thu Apr 25 09:20:32 1996
-+++ Makefile.in	Wed Jan 26 16:37:34 2000
-@@ -209,16 +209,10 @@
+--- Makefile.in.orig	Thu Apr 25 15:20:32 1996
++++ Makefile.in	Mon Mar 13 14:11:24 2000
+@@ -48,6 +48,7 @@
+ C++ = @CXX@
+ TABCC = @V_TABCC@
+ CCOPT = @V_CCOPT@
++CPPFLAGS= @CPPFLAGS@
+ 
+ INCLUDE_TK = @V_INCLUDE_TK@
+ INCLUDE_TCL = @V_INCLUDE_TCL@
+@@ -175,7 +176,7 @@
+ 	$(TABCC) $(RFLAG) -c $*.c
+ 
+ $(SRC3): mktab.c
+-	$(CC) $(CFLAGS) -o mktab mktab.c $(LIB) $(STATIC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mktab mktab.c $(LIB) $(STATIC)
+ 	rm -f $(SRC3)
+ 	./mktab -mulaw > tabmulaw.c
+ 	./mktab -sum > tabmix.c
+@@ -184,7 +185,7 @@
+ 	rm -f mktab
+ 
+ vat-gsm.o: vat-gsm.c
+-	rm -f $@; $(CC) -o $@ -c $(INCLUDE_GSM) $(CFLAGS) $*.c
++	rm -f $@; $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $*.c
+ 
+ tar: force
+ 	tar=vatbin-`cat VERSION`-@V_TAR_TARGET@.tar.gz ; \
+@@ -209,16 +210,10 @@
  	     rm ../$$name; chmod 444 $$tar
  
  install: force