philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various cygwin fixes and europa plugin fix

Browse Source
This commit is contained in:
Dan Mashal
2013-02-07 23:36:40 -08:00
parent 87b806a563
commit 580a613555
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.in
View File

@@ -198,15 +198,15 @@ $(_VERSION_): .config.h
dll/dummy: dll/dummy:
dll: .config.h $(srcdir)/Makefile dll/Makefile dll/dummy dll: .config.h Makefile dll/Makefile dll/dummy
cd dll \ cd dll \
&& $(MAKE) all && $(MAKE) all
installdll: $(srcdir)/Makefile dll/Makefile installdirs dll installdll: Makefile dll/Makefile installdirs dll
cd dll \ cd dll \
&& $(MAKE) 'DESTDIR=$(DESTDIR)' install && $(MAKE) 'DESTDIR=$(DESTDIR)' install
installdll_local: $(srcdir)/Makefile dll/Makefile installdll_local: Makefile dll/Makefile
cd dll \ cd dll \
&& $(MAKE) 'PLUGINDIR=$(local_dir)/.BitchX/plugins' && $(MAKE) 'PLUGINDIR=$(local_dir)/.BitchX/plugins'
@@ -237,11 +237,11 @@ install_local: all local_installdirs installdll_local
$(INSTALL_DATA) $(top_srcdir)/BitchX.quit $(DEFAULT_CTOOLZ_DIR)/$(DEFAULT_BITCHX_QUIT_FILE) $(INSTALL_DATA) $(top_srcdir)/BitchX.quit $(DEFAULT_CTOOLZ_DIR)/$(DEFAULT_BITCHX_QUIT_FILE)
$(INSTALL_DATA) $(top_srcdir)/BitchX.reasons $(DEFAULT_CTOOLZ_DIR)/$(DEFAULT_BITCHX_KICK_FILE) $(INSTALL_DATA) $(top_srcdir)/BitchX.reasons $(DEFAULT_CTOOLZ_DIR)/$(DEFAULT_BITCHX_KICK_FILE)
wserv: .config.h $(srcdir)/source/wserv.c $(srcdir)/source/term.c $(srcdir)/Makefile wserv: .config.h $(srcdir)/source/wserv.c $(srcdir)/source/term.c Makefile
cd source \ cd source \
&& $(MAKE) wserv && $(MAKE) wserv
scr-bx: .config.h $(srcdir)/source/scr-bx.c $(srcdir)/source/term.c $(srcdir)/Makefile scr-bx: .config.h $(srcdir)/source/scr-bx.c $(srcdir)/source/term.c Makefile
cd source \ cd source \
&& $(MAKE) scr-bx && $(MAKE) scr-bx
@@ -297,7 +297,7 @@ local_installdirs:
config: bxconf config: bxconf
bxconf: $(srcdir)/Makefile $(srcdir)/bx-conf/Makefile.in bxconf: Makefile $(srcdir)/bx-conf/Makefile.in
cd bx-conf \ cd bx-conf \
&& $(MAKE) all && $(MAKE) all
$(topdir)/bxconfigure || : $(topdir)/bxconfigure || :

2
configure.in
View File

@@ -1013,7 +1013,7 @@ GZIP_ENV="--best"
BZIP2="-9 --repetitive-best" BZIP2="-9 --repetitive-best"
dnl Should I keep this or not? dnl Should I keep this or not?
if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then if test -n "$EMXOS2" -o -n "$MINGWIN32"; then
bindir="\$(IRCLIB)" bindir="\$(IRCLIB)"
INSTALL_IRC="\$(IRCLIB)/\$(_VERSION_)\$(EXEEXT)" INSTALL_IRC="\$(IRCLIB)/\$(_VERSION_)\$(EXEEXT)"
IRCLIB="\${prefix}/BitchX" IRCLIB="\${prefix}/BitchX"

11
configure.in.rej Normal file
View File

@@ -0,0 +1,11 @@
--- /BitchX1.3/configure.in 2012-12-31 22:55:05.000000000 -0600
+++ BitchX1.3/configure.in 2013-01-09 04:55:24.729164000 -0600
@@ -1013,7 +1013,7 @@
BZIP2="-9 --repetitive-best"
dnl Should I keep this or not?
-if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then
+if test -n "$EMXOS2" -o -n "$MINGWIN32"; then
bindir="\$(IRCLIB)"
INSTALL_IRC="\$(IRCLIB)/\$(_VERSION_)\$(EXEEXT)"
IRCLIB="\${prefix}/BitchX"

2
dll/europa/europa.c
View File

@@ -357,7 +357,7 @@ int Europa_Init(IrcCommandDll **intp, Function_ptr *global_table) {
put_it("** Europa v%s connecting to database backend...", MOD_VERSION); put_it("** Europa v%s connecting to database backend...", MOD_VERSION);
/* connect to the database server */ /* connect to the database server */
if(!(mysql_connect(&mysql, DBHOST, DBUSER, DBPASSWD))) { if(!(mysql_real_connect(&mysql, DBHOST, DBUSER, DBPASSWD, NULL, 0, NULL, 0))) {
put_it("** Server refused login/password."); put_it("** Server refused login/password.");
return 0; return 0;
} }

2
macros/pluginsupport.m4
View File

@@ -148,7 +148,7 @@ AC_DEFUN(AC_CHECK_PLUGIN_SUPPORT,
;; ;;
CYGWIN*) CYGWIN*)
SHLIB_SUFFIX=".dll" SHLIB_SUFFIX=".dll"
SHLIB_LD="dllwrap --export-all --output-def \$(PLUGIN_NAME).def --implib lib\$(PLUGIN_NAME).a --driver-name \$(CC)" SHLIB_LD="$CC -shared"
;; ;;
OS/2*) OS/2*)
SHLIB_SUFFIX=".dll" SHLIB_SUFFIX=".dll"