summaryrefslogtreecommitdiff
blob: 428e7d31e7aaaaa7644c9c7337b825657f336cc6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
diff -NrU5 biew-570.original/configure biew-570/configure
--- biew-570.original/configure	2009-08-25 16:18:03.000000000 -0600
+++ biew-570/configure	2009-08-25 16:54:17.000000000 -0600
@@ -467,21 +467,24 @@
     qnxnto)
 	_cdefos="-D__QNX6__ -D__UNIX__ -D__OS_NAME__='\"QNX6\"' -D__OS__=\"qnxnto\" -U__QNX__ -U__NTO__ -D_VT100_ -DHAVE_TERMINAL_OUT=1 -D__DISABLE_MMF -DPREFIX=\"$_prefix\" $_cdefos"
 	_oslibs="-lncurses $_oslibs"
 	;;
     linux)
-        if test $_ld=gcc ; then
+        if test $_ld = gcc -o $_ld = x86_64-pc-linux-gnu-gcc -o $_ld = i686-pc-linux-gnu-gcc; then
             _osldef="-m32 $_osldef"
         fi
 	_cdefos="-D__LINUX__ -D__UNIX__ -D__OS_NAME__='\"Linux\"' -D__OS__=\"linux\" -Ulinux -D_VT100_ -DHAVE_TERMINAL_OUT=1 -DPREFIX=\"$_prefix\" $_cdefos"
 echocheck "gpm.h"
 	cat > $TMPC << EOF
 	#include <gpm.h>
 	int main(void) {return 0;}
 EOF
-	_gpm=no
-	cc_check -lgpm && _gpm=yes
+	# _gpm may be forced from command line
+	if test -z "$_gpm" ; then
+	    _gpm=no
+	    cc_check -lgpm && _gpm=yes
+	fi
 	if test "$_gpm" = yes ; then
 	    _cdefos="-DHAVE_MOUSE $_cdefos"
 	    _oslibs="-lgpm $_oslibs"
 	fi
 echores "$_gpm"