Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'develop' into bug/cygwinwinapi
  • Loading branch information
vanosg committed Oct 11, 2016
2 parents f11ce2c + 57419b9 commit fe63b17
Show file tree
Hide file tree
Showing 24 changed files with 149 additions and 2,362 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Expand Up @@ -26,3 +26,15 @@ _$*
*.ln
core
# CVS default ignores end
autom4te.cache
Makefile
.modules
.known_modules
config.h
lush.h
config.log
config.status
config.cache
eggdrop
EGGMOD.stamp
mod.xlibs
17 changes: 15 additions & 2 deletions INSTALL
Expand Up @@ -21,6 +21,19 @@ BURNED TO A HORRIBLE DEATH! IF YOU DO NOT READ THAT FILE I WILL
PERSONALLY WALK TO YOUR TERMINAL AND BEAT IT WITH A SMELLY SNEAKER! By
the way, read the README file.

Eggdrop on Windows with Cygwin
------------------------------

We recommand installing the following Cygwin packages in addition to the
default ones:

Interpreters: tcl, tcl-devel
Net: openssl-devel
Devel: autoconf, gcc-core, git, make
Utils: diffutils

Then proceed as described below.

Quick Startup
-------------

Expand Down Expand Up @@ -72,12 +85,12 @@ Eggdrop uses the GNU autoconfigure scripts to make things easier.
5. By default, version 1.8 uses SSL to protect botnet links. If you intend
on linking 1.8 bots together, you must run:

make ssl-cert
make sslcert

Or, if you installed your eggdrop to a different directory in
step 4, you will want to run:

make ssl-cert DEST=<directory>
make sslcert DEST=<directory>

Read docs/TLS for more info on this process.

Expand Down
6 changes: 4 additions & 2 deletions configure
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac fb7db08.
# From configure.ac d63cc00.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Eggdrop 1.8.0.
#
Expand Down Expand Up @@ -7136,6 +7136,7 @@ $as_echo "$as_me: Autoconfiguring Tcl with tclConfig.sh" >&6;}
# TEA extensions pass this us the version of TEA they think they
# are compatible with.
TEA_VERSION="3.10"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5
$as_echo_n "checking for correct TEA configuration... " >&6; }
if test x"${PACKAGE_NAME}" = x ; then
Expand Down Expand Up @@ -7352,8 +7353,9 @@ $as_echo "$as_me: WARNING: --with-tcl argument should refer to directory contain
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib/tcl8.6 2>/dev/null` \
Expand Down
12 changes: 9 additions & 3 deletions doc/Changes1.8
Expand Up @@ -4,6 +4,15 @@ Eggdrop Changes (since version 1.8.0)

1.8.0:

- Update tcl.m4 (Adds NetBSD tclConfig.sh path). Fixes #175
Patch by: thommey,Geo / Found by: fhorst

- Remove duplicate uppercase doc filenames
Patch by: Geo / Found by: jackal^

- Fix compile warning about potentially signed char as array subscript.
Patch by: thommey

- Install eggdrop-basic.conf on make install.
Patch by: Geo / Found by: thommey

Expand Down Expand Up @@ -159,9 +168,6 @@ Eggdrop Changes (since version 1.8.0)
- Fix duplicate array value in module API
Patch by: Geo / Found by: IRC user

- Add byte-based flood option
Patch by: remorse

- Reply properly to server-generated CTCPs
Patch by: Geo / Found by: IRC user

Expand Down
158 changes: 0 additions & 158 deletions doc/html/_sources/installAndSetup/INSTALL.txt

This file was deleted.

0 comments on commit fe63b17

Please sign in to comment.