[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sun Oct 21 12:39:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-21 17:38:35 UTC
Commited by: Federico Mennite <ite at techmonkeys.org>

Modified files:
     bootstrap configure.ac acconfig/acinclude.m4 src/Makefile.am
     src/mod/Makefile.am src/mod/compress.mod/.cvsignore
     src/mod/compress.mod/Makefile.am
     src/mod/perlscript.mod/perlscript.c

Added files:
     acconfig/.cvsignore src/mod/perlscript.mod/.cvsignore
     src/mod/perlscript.mod/Makefile.am

Log message:

* Added autoconf and automake support for perlscript.mod.
* Removed old stuff from bootstrap and src/mod/compress.mod/Makefile.am.
* Removed eggdrop_DEPENDENCIES. They are unneeded.
* Readded -Wall and -g3 compile options.

---------------------- diff included ----------------------
Index: eggdrop1.7/acconfig/.cvsignore
diff -u /dev/null eggdrop1.7/acconfig/.cvsignore:1.1
--- /dev/null	Sun Oct 21 12:38:35 2001
+++ eggdrop1.7/acconfig/.cvsignore	Sun Oct 21 12:38:24 2001
@@ -0,0 +1,6 @@
+depcomp
+install-sh
+ltmain.sh
+missing
+mkinstalldirs
+
Index: eggdrop1.7/acconfig/acinclude.m4
diff -u eggdrop1.7/acconfig/acinclude.m4:1.1 eggdrop1.7/acconfig/acinclude.m4:1.2
--- eggdrop1.7/acconfig/acinclude.m4:1.1	Fri Oct 19 20:19:42 2001
+++ eggdrop1.7/acconfig/acinclude.m4	Sun Oct 21 12:38:24 2001
@@ -1,7 +1,7 @@
 dnl acinclude.m4
 dnl   macros autoconf uses when building configure from configure.in
 dnl
-dnl $Id: acinclude.m4,v 1.1 2001/10/20 01:19:42 tothwolf Exp $
+dnl $Id: acinclude.m4,v 1.2 2001/10/21 17:38:24 ite Exp $
 dnl
 
 
@@ -29,6 +29,8 @@
   Compiler flags:             ${CFLAGS}
   Host System Type:           ${host}
   Install path:               ${prefix}
+  Compress module:            ${egg_compress}
+  Perl module:                ${egg_perlscript}
 
 See config.h for further configuration information.
 ------------------------------------------------------------------------
@@ -84,6 +86,29 @@
 ])
 
 
+dnl  EGG_CHECK_CFLAGS_WALL()
+dnl
+dnl  Checks whether the compiler supports the `-WAll' flag.
+AC_DEFUN(EGG_CHECK_CFLAGS_WALL, [dnl
+if test -z "$no_wall"
+then
+  if test -n "$GCC"
+  then
+    AC_CACHE_CHECK(whether the compiler understands -Wall, egg_cv_var_ccwall, [dnl
+      ac_old_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -Wall"
+      AC_TRY_COMPILE(,, egg_cv_var_ccwall=yes, egg_cv_var_ccwall=no)
+      CFLAGS="$ac_old_CFLAGS"
+    ])
+    if test "$egg_cv_var_ccwall" = "yes"
+    then
+      CFLAGS="$CFLAGS -Wall"
+    fi
+  fi
+fi
+])
+							
+
 dnl  EGG_PROG_STRIP()
 dnl
 AC_DEFUN(EGG_PROG_STRIP, [dnl
@@ -1192,6 +1217,7 @@
   # FIXME: this should be done along with `--with-efence'
   AC_CHECK_LIB(efence, malloc)
   EGG_DEBUG="-DDEBUG"
+  CFLAGS="$CFLAGS -g3"
 fi
 AC_SUBST(EGG_DEBUG)
 ])
@@ -1236,3 +1262,31 @@
 
 AM_CONDITIONAL(EGG_COMPRESS, test "$egg_compress" = "yes")
 ])
+
+# FIXME: is it worth to make this macro more anal? 
+dnl  EGG_PERLSCRIPT_MODULE
+dnl
+AC_DEFUN(EGG_PERLSCRIPT_MODULE, [dnl
+
+egg_perlscript=no
+
+AC_PATH_PROG(perlcmd, perl)
+PERL_LDFLAGS=`$perlcmd -MExtUtils::Embed -e ldopts 2>/dev/null`
+if test "x$PERL_LDFLAGS" = x
+then
+  AC_MSG_WARN([
+
+  Your system does not provide a working perl environment. The
+  perlscript module will therefore be disabled.
+  
+])
+else
+  PERL_CCFLAGS=`$perlcmd -MExtUtils::Embed -e ccopts 2>/dev/null`
+  egg_perlscript=yes
+  AC_SUBST(PERL_LDFLAGS)
+  AC_SUBST(PERL_CCFLAGS)
+fi
+
+AM_CONDITIONAL(EGG_PERLSCRIPT, test "$egg_perlscript" = "yes")
+])
+
Index: eggdrop1.7/bootstrap
diff -u eggdrop1.7/bootstrap:1.9 eggdrop1.7/bootstrap:1.10
--- eggdrop1.7/bootstrap:1.9	Sun Oct 21 09:51:34 2001
+++ eggdrop1.7/bootstrap	Sun Oct 21 12:38:24 2001
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: bootstrap,v 1.9 2001/10/21 14:51:34 tothwolf Exp $
+# $Id: bootstrap,v 1.10 2001/10/21 17:38:24 ite Exp $
 #
 # Recommended development tools versions:
 #   autoconf 2.52
@@ -28,7 +28,7 @@
 #gettextize --copy --force
 
 # Generate aclocal.m4 from acconfig/*.m4 files
-aclocal -I . -I acconfig
+aclocal -I acconfig
 
 # Bring in libtool with libtdl abstraction
 libtoolize --copy --ltdl
Index: eggdrop1.7/configure.ac
diff -u eggdrop1.7/configure.ac:1.3 eggdrop1.7/configure.ac:1.4
--- eggdrop1.7/configure.ac:1.3	Fri Oct 19 20:19:41 2001
+++ eggdrop1.7/configure.ac	Sun Oct 21 12:38:24 2001
@@ -40,6 +40,9 @@
 # Speedup compile
 EGG_CHECK_CCPIPE
 
+# Compile Warnings
+EGG_CHECK_CFLAGS_WALL
+
 # Checks for programs
 AC_PROG_LN_S
 EGG_PROG_STRIP
@@ -153,12 +156,13 @@
 EGG_DEFINE_VERSION_NUM
 
 EGG_COMPRESS_MODULE
+EGG_PERLSCRIPT_MODULE
 
 AC_CONFIG_SUBDIRS(libltdl)
 
 AC_SUBST(ac_aux_dir)
 
 # FIXME: module's Makefiles list will prolly become dynamic
-AC_OUTPUT([Makefile doc/Makefile scripts/Makefile src/Makefile src/compat/Makefile src/egglib/Makefile src/mod/Makefile src/adns/Makefile src/mod/Makefile intl/Makefile po/Makefile.in src/mod/assoc.mod/Makefile src/mod/blowfish.mod/Makefile src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/filesys.mod/Makefile src/mod/irc.mod/Makefile src/mod/notes.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/tclscript.mod/Makefile src/mod/transfer.mod/Makefile src/mod/uptime.mod/Makefile src/mod/woobie.mod/Makefile])
+AC_OUTPUT([Makefile doc/Makefile scripts/Makefile src/Makefile src/compat/Makefile src/egglib/Makefile src/mod/Makefile src/adns/Makefile src/mod/Makefile intl/Makefile po/Makefile.in src/mod/assoc.mod/Makefile src/mod/blowfish.mod/Makefile src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/filesys.mod/Makefile src/mod/irc.mod/Makefile src/mod/notes.mod/Makefile src/mod/perlscript.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/tclscript.mod/Makefile src/mod/transfer.mod/Makefile src/mod/uptime.mod/Makefile src/mod/woobie.mod/Makefile])
 
 EGG_MSG_CONFIGURE_END
Index: eggdrop1.7/src/Makefile.am
diff -u eggdrop1.7/src/Makefile.am:1.12 eggdrop1.7/src/Makefile.am:1.13
--- eggdrop1.7/src/Makefile.am:1.12	Sun Oct 21 11:05:52 2001
+++ eggdrop1.7/src/Makefile.am	Sun Oct 21 12:38:25 2001
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.12 2001/10/21 16:05:52 tothwolf Exp $
+# $Id: Makefile.am,v 1.13 2001/10/21 17:38:25 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 bindir			= $(exec_prefix)
@@ -77,45 +77,42 @@
 			users.h
 
 eggdrop_LDFLAGS		= -no-undefined
+
+# FIXME: test if there's dependency on gnu make. It shouldn't.
+if EGG_PERLSCRIPT
+  EGG_PRL = -dlopen mod/perlscript.mod/perlscript.la
+else
+  EGG_PRL =
+endif
+if EGG_COMPRESS
+  EGG_CMP = -dlopen mod/compress.mod/compress.la
+else
+  EGG_CMP = 
+endif
+
 # FIXME: dlopened/preopened module's list is going to be dynamically defined
 #        by ./configure
 eggdrop_LDADD		= @LIBLTDL@ \
-			"-dlopen" self \
-			"-dlopen" mod/assoc.mod/assoc.la \
-			"-dlopen" mod/blowfish.mod/blowfish.la \
-			"-dlopen" mod/compress.mod/compress.la \
-			"-dlopen" mod/channels.mod/channels.la \
-			"-dlopen" mod/console.mod/console.la \
-			"-dlopen" mod/ctcp.mod/ctcp.la \
-			"-dlopen" mod/filesys.mod/filesys.la \
-			"-dlopen" mod/irc.mod/irc.la \
-			"-dlopen" mod/notes.mod/notes.la \
-			"-dlopen" mod/server.mod/server.la \
-			"-dlopen" mod/share.mod/share.la \
-			"-dlopen" mod/tclscript.mod/tclscript.la \
-			"-dlopen" mod/transfer.mod/transfer.la \
-			"-dlopen" mod/uptime.mod/uptime.la \
-			"-dlopen" mod/woobie.mod/woobie.la \
+			-dlopen mod/assoc.mod/assoc.la \
+			-dlopen mod/blowfish.mod/blowfish.la \
+			-dlopen mod/channels.mod/channels.la \
+			$(EGG_CMP) \
+			-dlopen mod/console.mod/console.la \
+			-dlopen mod/ctcp.mod/ctcp.la \
+			-dlopen mod/filesys.mod/filesys.la \
+			-dlopen mod/irc.mod/irc.la \
+			-dlopen mod/notes.mod/notes.la \
+			$(EGG_PRL) \
+			-dlopen mod/server.mod/server.la \
+			-dlopen mod/share.mod/share.la \
+			-dlopen mod/tclscript.mod/tclscript.la \
+			-dlopen mod/transfer.mod/transfer.la \
+			-dlopen mod/uptime.mod/uptime.la \
+			-dlopen mod/woobie.mod/woobie.la \
 			compat/libcompat.la \
 			adns/libadns.la \
 			egglib/libegg.la \
 			$(XLIBS)
-
-eggdrop_DEPENDENCIES	= $(XREQS)
-			src/mod/assoc.mod/assoc.la \
-			src/mod/blowflish/blowfish.la \
-			src/mod/channels.la \
-			src/mod/console.la \
-			src/mod/ctcp.la \
-			src/mod/filesys.la \
-			src/mod/irc.la \
-			src/mod/notes.la \
-			src/mod/server.la \
-			src/mod/share.la \
-			src/mod/tclscript.la \
-			src/mod/transfer.la \
-			src/mod/uptime.la \
-			src/mod/woobie.la
 
 libtcle.a: $(TCLLIB)/lib$(TCLLIBFN)
 	echo "[ Fixing lib$(TCLLIBFN) -> libtcle.a ]"
Index: eggdrop1.7/src/mod/Makefile.am
diff -u eggdrop1.7/src/mod/Makefile.am:1.3 eggdrop1.7/src/mod/Makefile.am:1.4
--- eggdrop1.7/src/mod/Makefile.am:1.3	Sun Oct 21 11:05:52 2001
+++ eggdrop1.7/src/mod/Makefile.am	Sun Oct 21 12:38:25 2001
@@ -1,6 +1,6 @@
-# $Id: Makefile.am,v 1.3 2001/10/21 16:05:52 tothwolf Exp $
+# $Id: Makefile.am,v 1.4 2001/10/21 17:38:25 ite Exp $
 
 # FIXME: list will prolly become dynamic
-SUBDIRS			= assoc.mod blowfish.mod channels.mod compress.mod console.mod ctcp.mod filesys.mod irc.mod notes.mod server.mod share.mod tclscript.mod transfer.mod uptime.mod woobie.mod
+SUBDIRS			= assoc.mod blowfish.mod channels.mod compress.mod console.mod ctcp.mod filesys.mod irc.mod notes.mod perlscript.mod server.mod share.mod tclscript.mod transfer.mod uptime.mod woobie.mod
 
 MAINTAINERCLEANFILES	= Makefile.in
Index: eggdrop1.7/src/mod/compress.mod/.cvsignore
diff -u eggdrop1.7/src/mod/compress.mod/.cvsignore:1.3 eggdrop1.7/src/mod/compress.mod/.cvsignore:1.4
--- eggdrop1.7/src/mod/compress.mod/.cvsignore:1.3	Tue Oct  9 20:20:12 2001
+++ eggdrop1.7/src/mod/compress.mod/.cvsignore	Sun Oct 21 12:38:25 2001
@@ -6,9 +6,4 @@
 *.lo
 *.la
 *.obj
-*_config.h
-*_config.h.in
-configure
-config.log
-config.status
 
Index: eggdrop1.7/src/mod/compress.mod/Makefile.am
diff -u eggdrop1.7/src/mod/compress.mod/Makefile.am:1.5 eggdrop1.7/src/mod/compress.mod/Makefile.am:1.6
--- eggdrop1.7/src/mod/compress.mod/Makefile.am:1.5	Sun Oct 21 11:05:53 2001
+++ eggdrop1.7/src/mod/compress.mod/Makefile.am	Sun Oct 21 12:38:25 2001
@@ -1,8 +1,9 @@
-# $Id: Makefile.am,v 1.5 2001/10/21 16:05:53 tothwolf Exp $
+# $Id: Makefile.am,v 1.6 2001/10/21 17:38:25 ite Exp $
 
 # FIXME: optionally allow a system wide install by ignoring the line below.
 pkglibdir		= $(exec_prefix)/modules
 
+# FIXME: test if there's dependency on gnu make. It shouldn't.
 if EGG_COMPRESS
   EGG_CMP = compress.la
 else
@@ -14,7 +15,7 @@
 compress_la_LDFLAGS	= -module -avoid-version -no-undefined
 compress_la_LIBADD	= @TCL_LIBS@ @ZLIB@ @LIBS@
 
-MAINTAINERCLEANFILES	= Makefile.in configure config.h.in stamp-h.in
+MAINTAINERCLEANFILES	= Makefile.in
 
 INCLUDES		= -I$(top_builddir) -I$(top_srcdir)
 
Index: eggdrop1.7/src/mod/perlscript.mod/.cvsignore
diff -u /dev/null eggdrop1.7/src/mod/perlscript.mod/.cvsignore:1.1
--- /dev/null	Sun Oct 21 12:38:36 2001
+++ eggdrop1.7/src/mod/perlscript.mod/.cvsignore	Sun Oct 21 12:38:25 2001
@@ -0,0 +1,9 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.o
+*.lo
+*.la
+*.obj
+
Index: eggdrop1.7/src/mod/perlscript.mod/Makefile.am
diff -u /dev/null eggdrop1.7/src/mod/perlscript.mod/Makefile.am:1.1
--- /dev/null	Sun Oct 21 12:38:36 2001
+++ eggdrop1.7/src/mod/perlscript.mod/Makefile.am	Sun Oct 21 12:38:25 2001
@@ -0,0 +1,23 @@
+# $Id: Makefile.am,v 1.1 2001/10/21 17:38:25 ite Exp $
+
+# FIXME: optionally allow a system wide install by ignoring the line below.
+pkglibdir = $(exec_prefix)/modules
+
+# FIXME: test if there's dependency on gnu make. It shouldn't.
+if EGG_PERLSCRIPT
+  EGG_PRL = perlscript.la
+else
+  EGG_PRL =
+endif
+
+pkglib_LTLIBRARIES  = $(EGG_PRL)
+perlscript_la_SOURCES = perlscript.c
+perlscript_la_LDFLAGS = -module -avoid-version -no-undefined
+perlscript_la_LIBADD  = @PERL_LDFLAGS@ @LIBS@
+
+MAINTAINERCLEANFILES    = Makefile.in
+
+INCLUDES                = -I$(top_builddir) -I$(top_srcdir) @PERL_CCFLAGS@
+
+DEFS = $(EGG_DEBUG) @DEFS@
+
Index: eggdrop1.7/src/mod/perlscript.mod/perlscript.c
diff -u eggdrop1.7/src/mod/perlscript.mod/perlscript.c:1.2 eggdrop1.7/src/mod/perlscript.mod/perlscript.c:1.3
--- eggdrop1.7/src/mod/perlscript.mod/perlscript.c:1.2	Wed Oct 17 01:08:12 2001
+++ eggdrop1.7/src/mod/perlscript.mod/perlscript.c	Sun Oct 21 12:38:25 2001
@@ -45,8 +45,9 @@
 
 static int my_perl_callbacker(script_callback_t *me, ...)
 {
-	int retval, i, n;
+	int retval, i, n, count;
 	script_var_t var;
+	SV *arg;
 	void **al;
 	dSP;
 
----------------------- End of diff -----------------------



More information about the Changes mailing list