minor changes

diff --git a/ChangeLog b/ChangeLog
index 0e5a19f1288a019af2b0306ca91baa86b6493079..cb23b26e972d5fce2bdb35bc4648fa0e9e43826c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 GNU Thales 0.9.6 (XX/XX/XXXX)
+   - no longer report usage if you are using Unreal.
    - added support for unreal modules' modes. see the UnrealModules file.
    - added Memphisnet.org's memphistools ! see examples/memphistools/.
      Provided by XytraS <xytras@memphisnet.org>

diff --git a/Makefile.am b/Makefile.am
index 5055694f0353811a367e88b18f0d84b5b05e2395..5bb9d40140390f2207c612b0f6efa3b77018f3f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,4 @@ datadir=$(exec_prefix)
 
 SUBDIRS = src data
 
-EXTRA_DIST = README README.coders ChangeLog INSTALL tools examples ReportUsage.sh
+EXTRA_DIST = README README.coders ChangeLog INSTALL tools examples ReportUsage.sh UnrealModules NeedMaintainers

diff --git a/Makefile.in b/Makefile.in
index d2e0a37484a81517f2d34be59f5055afdf37fddb..d608a408f32afc84df6cdfad472dd12c07a2408f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,7 +73,7 @@ datadir = $(exec_prefix)
 
 SUBDIRS = src data
 
-EXTRA_DIST = README README.coders ChangeLog INSTALL tools examples ReportUsage.sh
+EXTRA_DIST = README README.coders ChangeLog INSTALL tools examples ReportUsage.sh UnrealModules NeedMaintainers
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ./src/config.h

diff --git a/ReportUsage.sh b/ReportUsage.sh
index e4898a828a561f99207eff3d49f5ac1418c70580..56d75992e7ad50294070c54a3b1ae5e2d889096a 100755 (executable)
--- a/ReportUsage.sh
+++ b/ReportUsage.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-echo "I'd like to collect some infos about who is using thales. This will only"
-echo "take a few seconds to answer the questions."
+echo "You selected an ircd which isn't much used. I'd like to collect some"
+echo "infos about who is using thales with this ircd. It will only take a"
+echo "few seconds to answer the questions."
 echo
-echo "Do you agree to answer them now [Y/N] ? (you can answer them later by"
-echo "running ./ReportUsage.sh in thales' directory)."
+echo "Do you agree to answer them now [Y/N] ? (You don't need to answer them,"
+echo "and it won't affect your usage of GNU Thales) "
 echo -n "[Y] > "
 read answer
 if [ "X$answer" = "XN" -o "X$answer" = "Xn" ]; then
@@ -16,7 +17,7 @@ echo "can eventually connect and say hi !"
 echo -n "> "
 read network
 echo
-echo "Which ircd are you using ?"
+echo "Which ircd are you using (please give the exact version number) ?"
 echo -n "> "
 read ircd
 echo

diff --git a/configure b/configure
index 826e391e33fa655c5faee9ef9d63661a9d7b9aad..7e425e70ed1a1b076a73d114277cc32540c99efa 100755 (executable)
--- a/configure
+++ b/configure
@@ -2528,6 +2528,7 @@ fi
 
 
 ok=0
+reportusage=1
 if test "x$with_ircd" != "x"; then
        case $with_ircd in
                [Bb][Aa][Hh][Aa][Mm][Uu][Tt])
@@ -2560,6 +2561,7 @@ EOF
 EOF
 
                        echo "Using Unreal IRCD"
+                       reportusage=0
                        ok=1
                        ;;
                [Uu][Ll][Tt][Ii][Mm][Aa][Tt][Ee]28)
@@ -2606,6 +2608,7 @@ if test $ok -eq 0; then
 #define IRCD_UNREAL 1
 EOF
 
+                       reportusage=0
                        ok=1
                        ;;
                2)
@@ -3030,7 +3033,7 @@ rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
-if test $REPORT -eq 1; then
+if test $REPORT -eq 1 -a $reportusage -eq 1; then
        ./ReportUsage.sh
 fi
 echo

diff --git a/configure.in b/configure.in
index a2d2d4f949d0eb479ba007f19eb490d45795cd35..fd7c7edccb0b000be76e5f3cd847d258f1650560 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -119,6 +119,7 @@ fi
 dnl IRCD type
 
 ok=0
+reportusage=1
 if test "x$with_ircd" != "x"; then
        case $with_ircd in
                [[Bb][Aa][Hh][Aa][Mm][Uu][Tt]])
@@ -139,6 +140,7 @@ if test "x$with_ircd" != "x"; then
                [[Uu][Nn][Rr][Ee][Aa][Ll]])
                        AC_DEFINE_UNQUOTED(IRCD_UNREAL, 1, 'ircd type')
                        echo "Using Unreal IRCD"
+                       reportusage=0
                        ok=1
                        ;;
                [[Uu][Ll][Tt][Ii][Mm][Aa][Tt][Ee]28])
@@ -176,6 +178,7 @@ if test $ok -eq 0; then
        case $KBDINPUT in
        1)
                        AC_DEFINE_UNQUOTED(IRCD_UNREAL, 1, 'ircd type')
+                       reportusage=0
                        ok=1
                        ;;
                2)
@@ -211,7 +214,7 @@ AC_ARG_ENABLE(no-modes,
 
 AC_OUTPUT(src/Makefile data/Makefile Makefile)
 
-if test $REPORT -eq 1; then
+if test $REPORT -eq 1 -a $reportusage -eq 1; then
        ./ReportUsage.sh
 fi
 echo