$Id$
--- aiccu.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
+++ aiccu/unix-console/Makefile	2010-06-17 10:59:40.000000000 +0200
@@ -10,9 +10,9 @@
 #  $Date: 2007-01-15 11:04:27 $
 # **********************************************************/
 
-SRCS	= main.c ../common/tun.c ../common/aiccu.c ../common/hash_md5.c ../common/hash_sha1.c ../common/common.c ../common/heartbeat.c ../common/tic.c ../common/ayiya.c ../common/aiccu_test.c ../common/resolver.c
+SRCS	= main.c ../common/tun.c ../common/aiccu.c ../common/hash_md5.c ../common/hash_sha1.c ../common/common.c ../common/heartbeat.c ../common/tic.c ../common/ayiya.c ../common/aiccu_test.c ../common/resolver.c ../common/dn_skipname.c
 INCS	= ../common/tun.h ../common/aiccu.h ../common/hash_md5.h ../common/hash_sha1.h ../common/common.h ../common/heartbeat.h ../common/tic.h ../common/ayiya.h ../common/resolver.h
-OBJS	= main.o ../common/tun.o ../common/aiccu.o ../common/hash_md5.o ../common/hash_sha1.o ../common/common.o ../common/heartbeat.o ../common/tic.o ../common/ayiya.o ../common/aiccu_test.o ../common/resolver.o
+OBJS	= main.o ../common/tun.o ../common/aiccu.o ../common/hash_md5.o ../common/hash_sha1.o ../common/common.o ../common/heartbeat.o ../common/tic.o ../common/ayiya.o ../common/aiccu_test.o ../common/resolver.o ../common/dn_skipname.o
 
 # New features not fully implemented and thus disabled for now
 #CFLAGS	+= -D NEWSTUFF_TSP -D NEWSTUFF_TEEPEE
@@ -46,110 +46,103 @@ LDFLAGS += -lgnutls
 endif
 
 # Linux
-ifeq ($(shell uname | grep -c "Linux"),1)
 CFLAGS  += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\""
 SRCS	+= ../common/aiccu_linux.c
 OBJS	+= ../common/aiccu_linux.o
-LDFLAGS	+= -lpthread -lresolv
-endif
+LDFLAGS	+= -pthread -lresolv
 
 # FreeBSD
-ifeq ($(shell uname | grep -c "FreeBSD"),1)
-CFLAGS	+= -D_FREEBSD
+#ifeq ($(shell uname | grep -c "FreeBSD"),1)
+#CFLAGS	+= -D_FREEBSD
 
 # FreeBSD 4.x
-ifeq ($(shell uname -r | cut -c 1),4)
-CFLAGS	+= -D AICCU_TYPE="\"freebsd4\""
-SRCS	+= ../common/aiccu_freebsd4.c
-OBJS	+= ../common/aiccu_freebsd4.o
-else
+#ifeq ($(shell uname -r | cut -c 1),4)
+#CFLAGS	+= -D AICCU_TYPE="\"freebsd4\""
+#SRCS	+= ../common/aiccu_freebsd4.c
+#OBJS	+= ../common/aiccu_freebsd4.o
+#else
 # FreeBSD 5.x/6.x/7.x
-CFLAGS	+= -D NEED_IFHEAD -D AICCU_TYPE="\"kame\""
-SRCS	+= ../common/aiccu_kame.c
-OBJS	+= ../common/aiccu_kame.o
-endif
-endif
+#CFLAGS	+= -D NEED_IFHEAD -D AICCU_TYPE="\"kame\""
+#SRCS	+= ../common/aiccu_kame.c
+#OBJS	+= ../common/aiccu_kame.o
+#endif
+#endif
 
 # DragonFlyBSD
-ifeq ($(shell uname | grep -c "DragonFly"),1)
-CFLAGS	+= -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
-SRCS	+= ../common/aiccu_freebsd4.c
-OBJS	+= ../common/aiccu_freebsd4.o
-CFLAGS	+= -pthread
-endif
+#ifeq ($(shell uname | grep -c "DragonFly"),1)
+#CFLAGS	+= -D_DFBSD -D NEED_IFHEAD -D AICCU_TYPE="\"dragonfly\""
+#SRCS	+= ../common/aiccu_freebsd4.c
+#OBJS	+= ../common/aiccu_freebsd4.o
+#CFLAGS	+= -pthread
+#endif
 
 # NetBSD
-ifeq ($(shell uname | grep -c "NetBSD"),1)
-CFLAGS	+= -D_NETBSD -D AICCU_TYPE="\"kame\""
-
+#ifeq ($(shell uname | grep -c "NetBSD"),1)
+#CFLAGS	+= -D_NETBSD -D AICCU_TYPE="\"kame\""
+#
 # Check if net/if_tun.h has TUNSIFHEAD and enable support for it
-ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),1)
+#ifneq ($(shell grep -c TUNSIFHEAD /usr/include/net/if_tun.h 2>/dev/null),1)
 # Supports TUNSIFHEAD -> AYIYA/l2tp available
-CFLAGS	+= -D NEED_IFHEAD
-else
+#CFLAGS	+= -D NEED_IFHEAD
+#else
 # Doesn't support TUNSIFHEAD -> No AYIYA/l2tp available
-CFLAGS	+= -D NO_IFHEAD
-endif
+#CFLAGS	+= -D NO_IFHEAD
+#endif
 
-SRCS	+= ../common/aiccu_kame.c
-OBJS	+= ../common/aiccu_kame.o
-CFLAGS	+= -pthread -D_NETBSD_SOURCE
-endif
+#SRCS	+= ../common/aiccu_kame.c
+#OBJS	+= ../common/aiccu_kame.o
+#CFLAGS	+= -pthread -D_NETBSD_SOURCE
+#endif
 
 # OpenBSD
-ifeq ($(shell uname | grep -c "OpenBSD"),1)
-CFLAGS	+= -D_OPENBSD -D HAS_IFHEAD
-# 2.7-2.9
-ifeq ($(shell uname -r | cut -c 1),2)
-CFLAGS	+= -D AICCU_TYPE="\"openbsd2\""
-SRCS	+= ../common/aiccu_openbsd2.c
-OBJS	+= ../common/aiccu_openbsd2.o
-else
-# 3.x-4.x etc
-CFLAGS	+= -D AICCU_TYPE="\"openbsd\""
-SRCS	+= ../common/aiccu_openbsd.c
-OBJS	+= ../common/aiccu_openbsd.o
-endif
-CFLAGS	+= -pthread
-endif
+#ifeq ($(shell uname | grep -c "OpenBSD"),1)
+#CFLAGS	+= -D_OPENBSD -D HAS_IFHEAD
+## 2.7-2.9
+#ifeq ($(shell uname -r | cut -c 1),2)
+#CFLAGS	+= -D AICCU_TYPE="\"openbsd2\""
+#SRCS	+= ../common/aiccu_openbsd2.c
+#OBJS	+= ../common/aiccu_openbsd2.o
+#else
+## 3.x-4.x etc
+#CFLAGS	+= -D AICCU_TYPE="\"openbsd\""
+#SRCS	+= ../common/aiccu_openbsd.c
+#OBJS	+= ../common/aiccu_openbsd.o
+#endif
+#CFLAGS	+= -pthread
+#endif
 
 # Darwin
-ifeq ($(shell uname | grep -c "Darwin"),1)
-CFLAGS	+= -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
-SRCS	+= ../common/aiccu_darwin.c
-OBJS	+= ../common/aiccu_darwin.o
-LDFLAGS	+= -lresolv
-endif
+#ifeq ($(shell uname | grep -c "Darwin"),1)
+#CFLAGS	+= -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\""
+#SRCS	+= ../common/aiccu_darwin.c
+#OBJS	+= ../common/aiccu_darwin.o
+#LDFLAGS	+= -lresolv
+#endif
 
 # SunOS / Solaris
-ifeq ($(shell uname | grep -c "SunOS"),1)
-CFLAGS	+= -D_SUNOS -D AICCU_TYPE="\"sunos\""
-SRCS	+= ../common/aiccu_sunos.c
-OBJS	+= ../common/aiccu_sunos.o
-LDFLAGS	+= -lsocket -lnsl -lresolv
-endif
+#ifeq ($(shell uname | grep -c "SunOS"),1)
+#CFLAGS	+= -D_SUNOS -D AICCU_TYPE="\"sunos\""
+#SRCS	+= ../common/aiccu_sunos.c
+#OBJS	+= ../common/aiccu_sunos.o
+#LDFLAGS	+= -lsocket -lnsl -lresolv
+#endif
 
 # AIX
-ifeq ($(shell uname | grep -c "AIX"),1)
-CC	= @/usr/vac/bin/xlc_r
-CFLAGS	= -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
-CFLAGS	+= -D AICCU_CONSOLE
-CFLAGS	+= -D_AIX -D AICCU_TYPE="\"aix\""
-SRCS	+= ../common/aiccu_aix.c
-OBJS	+= ../common/aiccu_aix.o
-LDFLAGS	+= -lpthread
-endif
+#ifeq ($(shell uname | grep -c "AIX"),1)
+#CC	= @/usr/vac/bin/xlc_r
+#CFLAGS	= -qthreaded -q64 -qlanglvl=stdc99 -bmaxdata:0xD0000000 -D_64BIT -g -qdbxextra -qfullpath -qheapdebug -qformat=all -qcheck=all
+#CFLAGS	+= -D AICCU_CONSOLE
+#CFLAGS	+= -D_AIX -D AICCU_TYPE="\"aix\""
+#SRCS	+= ../common/aiccu_aix.c
+#OBJS	+= ../common/aiccu_aix.o
+#LDFLAGS	+= -lpthread
+#endif
 
 
 all: aiccu
 
 aiccu:	$(OBJS) ${SRCS} ${INCS}
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
-	strip $@
-endif
-endif
 
 clean:
 	$(RM) -f $(OBJS) aiccu