X-Git-Url: https://git.deb.at/?p=pkg%2Fnetris.git;a=blobdiff_plain;f=Configure;h=fbc57a816bdf864ac39d4cd7c2c394dfae2859b0;hp=7fe293ee71df458b7a55a0cff0c80378274614cb;hb=b5e5f5d6ac3ac2375f0932a76dca0bba3bcad936;hpb=89d91b6cfd98e514b3e418526ba854d00beb876c;ds=sidebyside

diff --git a/Configure b/Configure
index 7fe293e..fbc57a8 100755
--- a/Configure
+++ b/Configure
@@ -1,7 +1,7 @@
 :
 #
 # Netris -- A free networked version of T*tris
-# Copyright (C) 1994,1995,1996  Mark H. Weaver <mhw@netris.org>
+# Copyright (C) 1994-1996,1999  Mark H. Weaver <mhw@netris.org>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,13 +17,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $Id: Configure,v 1.17 1996/02/09 08:22:03 mhw Exp $
+# $Id: Configure,v 1.18 1999/05/16 06:56:19 mhw Exp $
 #
 
 CC="gcc"
 COPT="-g -O"
 CEXTRA=""
 LEXTRA=""
+CURSES_HACK=false
 
 while [ $# -ge 1 ]; do
 	opt="$1"
@@ -53,6 +54,9 @@ while [ $# -ge 1 ]; do
 			LEXTRA="$1"
 			shift
 			;;
+		--curses-hack)
+			CURSES_HACK=true
+			;;
 		*)
 			cat << "END"
 Usage: ./Configure [options...]
@@ -62,6 +66,7 @@ Usage: ./Configure [options...]
     --copt <opt>: Set C optimization flags
     --cextra <opt>: Set extra C flags
     --lextra <opt>: Set extra linker flags
+    --curses-hack: Disable scroll-optimization for broken curses
 END
 			exit 1
 			;;
@@ -73,8 +78,12 @@ CFLAGS="$COPT $CEXTRA"
 echo "Checking for libraries"
 echo 'main(){}' > test.c
 LFLAGS=""
-for lib in -lsocket -lnsl -lcurses -ltermcap
-do
+for lib in -lcurses -lncurses; do
+	if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then
+		LFLAGS="$lib"
+	fi
+done
+for lib in -lsocket -lnsl -ltermcap; do 
 	if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then
 		LFLAGS="$LFLAGS $lib"
 	fi
@@ -144,7 +153,8 @@ echo "Creating Makefile"
 sed -e "s/-LFLAGS-/$LFLAGS/g" -e "s/-SRCS-/$SRCS/g" \
 	-e "s/-OBJS-/$OBJS/g" -e "s/-DISTFILES-/$DISTFILES/g" \
 	-e "s/-COPT-/$COPT/g" -e "s/-CEXTRA-/$CEXTRA/g" \
-	-e "s/-LEXTRA-/$LEXTRA/g" -e "s/-CC-/$CC/g" << "END" > Makefile
+	-e "s/-LEXTRA-/$LEXTRA/g" -e "s/-CC-/$CC/g" \
+	<< "END" > Makefile
 #
 # Automatically generated by ./Configure -- DO NOT EDIT!
 #
@@ -244,6 +254,9 @@ fi
 if [ "$HAS_SIGPROCMASK" = "true" ]; then
 	echo "#define HAS_SIGPROCMASK" >> config.h
 fi
+if [ "$CURSES_HACK" = "true" ]; then
+	echo "#define CURSES_HACK" >> config.h
+fi
 
 echo "Running 'make depend'"
 if make depend; then :; else cat << END; fi