[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright configure
From: |
Jeffrey Bedard |
Subject: |
[Antiright-devel] antiright configure |
Date: |
Wed, 25 Aug 2004 19:50:20 -0400 |
CVSROOT: /cvsroot/antiright
Module name: antiright
Branch:
Changes by: Jeffrey Bedard <address@hidden> 04/08/25 23:45:52
Modified files:
. : configure
Log message:
Fixed bug in which MAKE is defined as $CC.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/configure.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
Patches:
Index: antiright/configure
diff -u antiright/configure:1.39 antiright/configure:1.40
--- antiright/configure:1.39 Mon Aug 23 01:15:56 2004
+++ antiright/configure Wed Aug 25 23:45:52 2004
@@ -38,8 +38,8 @@
fi
# Set up resource file installation directory.
-testdirs="/usr/lib/X11/app-defaults /etc/X11/app-defaults\
- /usr/local/lib/X11/app-defaults"
+testdirs="/usr/lib/X11/app-defaults /usr/X11R6/lib/X11/app-defaults \
+ /etc/X11/app-defaults /usr/local/lib/X11/app-defaults"
for dir in $testdirs
do
if [ -d $dir ]; then
@@ -48,6 +48,18 @@
fi
done
+MAKE="$(which gmake)"
+if [ -z "$MAKE" ]; then
+ MAKE="$(which make)"
+fi
+
+CC="$(which gcc)"
+if [ -z "$CC" ]; then
+ CC="$(which cc)"
+fi
+
+INSTALL="$(which install)"
+
INCLUDE="$INCLUDE -I/usr/local/include -I/usr/X11R6/include"
LIBDIR="$LIBDIR -L/usr/local/lib -L/usr/X11R6/lib"
@@ -64,6 +76,8 @@
if [ ! -f /usr/X11R6/include/Xm/XpmP.h ]; then
LIBS="$LIBS -lXpm"
+else
+ DEFS="$DEFS -DHAVE_XMXPM"
fi
if [ -f /usr/local/lib/libXlt.so ] || [ -f /usr/X11R6/lib/libXlt.so ]; then
@@ -80,8 +94,8 @@
ed <<EOF Makefile 1> /dev/null 2> /dev/null
25a
PREFIX=$PREFIX
-CC=$(which cc)
-MAKE=$(which make)
+CC=$CC
+MAKE=$MAKE
INCLUDE=$INCLUDE
LIBDIR=$LIBDIR
LIBS=$LIBS
@@ -91,7 +105,7 @@
DEFS=$DEFS
RESDIR=$RESDIR
VERSION=$VERSION
-INSTALL=$(which install)
+INSTALL=$INSTALL
.
wq
EOF