head	1.4;
access;
symbols
	RELEASE_8_3_0:1.4
	RELEASE_9_0_0:1.4
	RELEASE_7_4_0:1.4
	RELEASE_8_2_0:1.4
	RELEASE_6_EOL:1.4
	RELEASE_8_1_0:1.4
	RELEASE_7_3_0:1.4
	RELEASE_8_0_0:1.4
	RELEASE_7_2_0:1.4
	RELEASE_7_1_0:1.4
	RELEASE_6_4_0:1.4
	RELEASE_5_EOL:1.3
	RELEASE_7_0_0:1.3
	RELEASE_6_3_0:1.3
	PRE_XORG_7:1.3
	RELEASE_4_EOL:1.3
	RELEASE_6_2_0:1.3
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.3
	RELEASE_5_4_0:1.3
	RELEASE_4_11_0:1.3
	RELEASE_5_3_0:1.3
	RELEASE_4_10_0:1.3
	RELEASE_5_2_1:1.3
	RELEASE_5_2_0:1.3
	RELEASE_4_9_0:1.3
	RELEASE_5_1_0:1.2
	RELEASE_4_8_0:1.2
	RELEASE_5_0_0:1.2
	RELEASE_4_7_0:1.2
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.2
	RELEASE_4_0_0:1.2
	RELEASE_3_4_0:1.2
	RELEASE_3_3_0:1.2
	RELEASE_3_2_0:1.2
	RELEASE_3_1_0:1.2
	RELEASE_2_2_8:1.2
	RELEASE_3_0_0:1.2;
locks; strict;
comment	@# @;


1.4
date	2008.08.03.03.18.25;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	2003.06.25.01.23.22;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	98.09.23.06.45.28;	author brian;	state Exp;
branches;
next	1.1;

1.1
date	98.09.22.16.11.07;	author smace;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to 3.0
@
text
@--- unix/configure.orig	2008-06-19 23:32:20.000000000 +0400
+++ unix/configure	2008-08-03 06:35:03.000000000 +0400
@@@@ -98,7 +98,6 @@@@
 _EOF_
       $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
       if test $? -eq 0; then
-        CFLAGS_OPT='-O3'
         echo "  GNU C ($CFLAGS_OPT)"
         # Special Mac OS X shared library "ld" option?
         if test ` uname -s 2> /dev/null ` = 'Darwin'; then
@@@@ -110,7 +109,6 @@@@
           rm -f conftest
         fi
       else
-        CFLAGS_OPT='-O'
         echo "  Other-unknown C ($CFLAGS_OPT)"
       fi
     fi
@@@@ -224,7 +222,6 @@@@
 [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
 [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
 [ -f /lib/cpp ] && CPP=/lib/cpp
-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
 [ -f /xenix ] && CPP="${CC} -E"
 [ -f /lynx.os ] && CPP="${CC} -E"
 
@@@@ -244,7 +241,7 @@@@
     echo "int foo() { return 0;}" > conftest.c
     $CC -c conftest.c >/dev/null 2>/dev/null
     echo Check if compiler generates underlines
-    nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
+    nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null
     [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
     if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
       if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
@


1.3
log
@Fix for ia64's cpp

Submitted by:   marcel
@
text
@d1 19
a19 3
--- unix/configure.orig	Tue Apr 27 12:49:05 1999
+++ unix/configure	Tue Jun 24 17:47:35 2003
@@@@ -23,7 +23,6 @@@@
d27 1
a27 1
@@@@ -38,7 +37,7 @@@@
@


1.2
log
@Remove previous elf patch.
Instead, change grep to egrep in configure so that
it does what was intended.
Ok'd by: smace & ache
@
text
@d1 11
a11 3
--- unix/configure.orig	Tue Sep 22 14:33:00 1998
+++ unix/configure	Tue Sep 22 14:33:18 1998
@@@@ -49,7 +49,7 @@@@
@


1.1
log
@Support ELF.

1.  Invoke prefixing of external symbols in assembly code functions via
    __ELF__.
@
text
@d1 11
a11 31
--- unix/Makefile.orig		Fri Oct 24 13:38:04 1997
+++ unix/Makefile	Thu Sep 17 22:25:33 1998
@@@@ -44,6 +44,12 @@@@
 LFLAGS1 =
 LFLAGS2 = -s
 
+.if ${PORTOBJFORMAT} == elf
+ELFDEF = -D__ELF__
+.else
+ELFDEF =
+.endif
+
 # object file lists
 OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o crypt.o ttyio.o \
        unix.o crc32.o crctab.o
@@@@ -81,13 +87,13 @@@@
 zipup.o: unix/zipup.h
 
 match.o: match.S
-	$(CPP) match.S > _match.s
+	$(CPP) $(ELFDEF) match.S > _match.s
 	$(AS) _match.s
 	mv _match.o match.o
 	rm -f _match.s
 
 crc_i386.o: crc_i386.S
-	$(CPP) crc_i386.S > crc_i386.s
+	$(CPP) $(ELFDEF) crc_i386.S > crc_i386.s
 	$(AS) crc_i386.s
 	rm -f crc_i386.s
 
@
