Explorar o código

Various fixes for gentoo

svn: 49
Bryan Drewery %!s(int64=23) %!d(string=hai) anos
pai
achega
04df65f6fb
Modificáronse 3 ficheiros con 10 adicións e 5 borrados
  1. 2 2
      Makefile.in
  2. 7 2
      build
  3. 1 1
      src/cmds.c

+ 2 - 2
Makefile.in

@@ -31,8 +31,8 @@ CFLGS = -fno-strict-aliasing
 # btw to turn STRIP off, do 'STRIP = touch' not 'STRIP ='
 # btw to turn STRIP off, do 'STRIP = touch' not 'STRIP ='
 
 
 # defaults
 # defaults
-#CC = @CC@
-CC = gcc-2.95
+CC = @CC@
+#CC = gcc-2.95
 LD = @CC@
 LD = @CC@
 STRIP = @STRIP@
 STRIP = @STRIP@
 RANLIB = @RANLIB@
 RANLIB = @RANLIB@

+ 7 - 2
build

@@ -4,7 +4,7 @@
 
 
 #add in 'cont' support for NOT using make clean.
 #add in 'cont' support for NOT using make clean.
 
 
-TCLDIR="/home/wheel/bryan"
+TCLDIR="/home/bryan"
 
 
 #change this to 0 to not clean previously compiled files (faster/for dev)
 #change this to 0 to not clean previously compiled files (faster/for dev)
 clean=1
 clean=1
@@ -119,7 +119,12 @@ echo "[*] Building pack for $os"
 # Run ./configure, then verify it's ok
 # Run ./configure, then verify it's ok
 echo "[*] Configuring..."
 echo "[*] Configuring..."
 umask 077 >/dev/null
 umask 077 >/dev/null
-./configure --disable-tcl-threads --with-tcllib=${TCLDIR}/lib/libtcl8.4.a --with-tclinc=${TCLDIR}/include/tcl.h > /dev/null 2>configure.temp
+if test -z ${TCLDIR}
+then
+  ./configure --disable-tcl-threads > /dev/null 2>configure.temp
+else
+  ./configure --disable-tcl-threads --with-tcllib=${TCLDIR}/lib/libtcl8.4.a --with-tclinc=${TCLDIR}/include/tcl.h > /dev/null 2>configure.temp
+fi
 #if test "`cat configure.temp`"
 #if test "`cat configure.temp`"
 #then
 #then
 #  echo "Configure error'd"
 #  echo "Configure error'd"

+ 1 - 1
src/cmds.c

@@ -1194,7 +1194,7 @@ static void cmd_console(struct userrec *u, int idx, char *par)
   if ((nick [0] == '+' && findchan_by_dname(nick)) ||
   if ((nick [0] == '+' && findchan_by_dname(nick)) ||
       (nick [0] != '+' && strchr(CHANMETA "*", nick[0]))) {
       (nick [0] != '+' && strchr(CHANMETA "*", nick[0]))) {
     chan = findchan_by_dname(nick);
     chan = findchan_by_dname(nick);
-    if ((strcmp(nick, "*") && !chan) { 
+    if (strcmp(nick, "*") && !chan) { 
       dprintf(idx, "Invalid console channel: %s.\n", nick);
       dprintf(idx, "Invalid console channel: %s.\n", nick);
       return;
       return;
     }
     }