Removed 'irregular' output caused by Brains test for strlcpy

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index c86190a2d089e30ae8fdf7d91c9229758f159fac..258ed77b6b8a5d216d298c13d0fff0226b4ca513 100755 (executable)
--- a/configure
+++ b/configure
@@ -107,7 +107,7 @@ if [ "$1" = "-update" -o "$2" = "-update" ] ; then
         flags=`grep '$CompileFlags: ' $module | sed 's/\/\* $CompileFlags://' | sed 's/\*\///'`
         mod=`echo $module | sed 's/.cpp/.so/' | sed 's/src\/modules\///'`
        mod2=`echo $module | sed 's/src\/modules\///'`
-        echo "$mod:" >> src/modules/Makefile
+        echo "$mod: $mod2 ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/servers.h ../../include/base.h" >> src/modules/Makefile
         echo " \$(CC) -I../../include \$(FLAGS) -shared$flags -o $mod $mod2" >> src/modules/Makefile
        echo "  @cp $mod \$(MODPATH)/" >> src/modules/Makefile
         echo "" >> src/modules/Makefile
@@ -142,9 +142,11 @@ exists () { # because some shells don't have test -e
 
 echo "#include <string.h>">.test.cpp
 echo "#include <stdio.h>">>.test.cpp
-echo "int main() { char a[10]; char b[10]; strlcpy(a,b,10); printf(\"%d\\n\",999); }" >>.test.cpp
+echo "int main() { char a[10]; char b[10]; strlcpy(a,b,10); printf(\"%d\\n\",9); }" >>.test.cpp
 g++ -o .test .test.cpp 2>&1
-HAS_STRLCPY=`./.test 2>&1`
+if [ ! -e ".test" ] ; then
+       HAS_STRLCPY=1
+fi 
 rm -f .test.cpp .test
 
 clear
@@ -480,7 +482,7 @@ echo "#define GCC3" >>include/inspircd_config.h
                echo "#define GCC34" >>include/inspircd_config.h
        fi
 fi
-if [ "$HAS_STRLCPY" -eq "999" ] ; then
+if [ $HAS_STRLCPY != "1" ] ; then
        echo "#define HAS_STRLCPY" >>include/inspircd_config.h
 fi
 echo "#define SYSLOG_FACILITY LOG_DAEMON" >>include/inspircd_config.h
@@ -552,7 +554,7 @@ for module in src/modules/*.cpp ; do
      flags=`grep '$CompileFlags: ' $module | sed 's/\/\* $CompileFlags://' | sed 's/\*\///'`
      mod=`echo $module | sed 's/.cpp/.so/' | sed 's/src\/modules\///'`
      mod2=`echo $module | sed 's/src\/modules\///'`
-     echo "$mod:" >> src/modules/Makefile
+     echo "$mod: $mod2 ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/servers.h ../../include/base.h" >> src/modules/Makefile
      echo "    \$(CC) -I../../include \$(FLAGS) -shared$flags -o $mod $mod2" >> src/modules/Makefile
      echo "    @cp $mod \$(MODPATH)/" >> src/modules/Makefile
      echo "" >> src/modules/Makefile