[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Thu Dec 21 14:23:00 CST 2000


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2000-12-21 20:20:14 UTC

Modified files:
     aclocal.m4 configure configure.in doc/UPDATES1.6 src/patch.h
     src/mod/Makefile.in

Log message:

ITE's configure path fix patch

---------------------- diff included ----------------------
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.30 eggdrop1.6/aclocal.m4:1.31
--- eggdrop1.6/aclocal.m4:1.30	Tue Nov 28 20:46:16 2000
+++ eggdrop1.6/aclocal.m4	Thu Dec 21 14:20:02 2000
@@ -1,7 +1,7 @@
 dnl aclocal.m4
 dnl   macros autoconf uses when building configure from configure.in
 dnl
-dnl $Id: aclocal.m4,v 1.30 2000/11/29 02:46:16 guppy Exp $
+dnl $Id: aclocal.m4,v 1.31 2000/12/21 20:20:02 guppy Exp $
 dnl
 
 
@@ -1177,6 +1177,21 @@
 AC_SUBST(DEST)dnl
 ])dnl
 
+
+dnl  EGG_SUBST_MOD_UPDIR()
+dnl
+dnl  Since module's Makefiles aren't generated by configure, some
+dnl  paths in src/mod/Makefile.in take care of them. For correct 
+dnl  path "calculation", we need to keep absolute paths in mind 
+dnl  (which don't need a "../" pre-pended).
+AC_DEFUN(EGG_SUBST_MOD_UPDIR, [dnl
+case "$srcdir" in
+  [[\\/]]* | ?:[[\\/]]* ) MOD_UPDIR="" ;;
+  * )                     MOD_UPDIR="../" ;;
+esac
+AC_SUBST(MOD_UPDIR)dnl
+])dnl
+  
 
 dnl  EGG_REPLACE_IF_CHANGED(FILE-NAME, CONTENTS-CMDS, INIT-CMDS)
 dnl
Index: eggdrop1.6/configure
diff -u eggdrop1.6/configure:1.50 eggdrop1.6/configure:1.51
--- eggdrop1.6/configure:1.50	Tue Nov 28 20:46:16 2000
+++ eggdrop1.6/configure	Thu Dec 21 14:20:02 2000
@@ -3640,6 +3640,11 @@
   DEST=\${prefix}
 fi
 
+case "$srcdir" in
+  [\\/]* | ?:[\\/]* ) MOD_UPDIR="" ;;
+  * )                     MOD_UPDIR="../" ;;
+esac
+
   
 
 
@@ -3807,6 +3812,7 @@
 s%@TCL_LIBS@%$TCL_LIBS%g
 s%@EGGVERSION@%$EGGVERSION%g
 s%@DEST@%$DEST%g
+s%@MOD_UPDIR@%$MOD_UPDIR%g
 
 CEOF
 EOF
Index: eggdrop1.6/configure.in
diff -u eggdrop1.6/configure.in:1.36 eggdrop1.6/configure.in:1.37
--- eggdrop1.6/configure.in:1.36	Tue Nov 28 20:46:16 2000
+++ eggdrop1.6/configure.in	Thu Dec 21 14:20:02 2000
@@ -119,6 +119,7 @@
 
 EGG_SUBST_EGGVERSION
 EGG_SUBST_DEST
+EGG_SUBST_MOD_UPDIR
 EGG_CATCH_MAKEFILE_REBUILD
 
 AC_OUTPUT(Makefile doc/Makefile scripts/Makefile src/Makefile src/md5/Makefile src/compat/Makefile src/mod/Makefile)
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.37 eggdrop1.6/doc/UPDATES1.6:1.38
--- eggdrop1.6/doc/UPDATES1.6:1.37	Thu Dec 21 14:12:43 2000
+++ eggdrop1.6/doc/UPDATES1.6	Thu Dec 21 14:20:02 2000
@@ -4,6 +4,8 @@
 
 1.6.2
 Found by  Fixed by  What...
+          ITE       made configure work properly when called with an
+                    absolute path
 Ian	  Ian/      share.mod now uses .share.nick.unixtime.users as a
           guppy     temp file when recieving the userfile
           toot      fixed XTRA info from not working
Index: eggdrop1.6/src/mod/Makefile.in
diff -u eggdrop1.6/src/mod/Makefile.in:1.12 eggdrop1.6/src/mod/Makefile.in:1.13
--- eggdrop1.6/src/mod/Makefile.in:1.12	Sun Jul 23 15:47:13 2000
+++ eggdrop1.6/src/mod/Makefile.in	Thu Dec 21 14:20:03 2000
@@ -1,10 +1,11 @@
 # Makefile for src/mod/
-# $Id: Makefile.in,v 1.12 2000/07/23 20:47:13 fabian Exp $
+# $Id: Makefile.in,v 1.13 2000/12/21 20:20:03 guppy Exp $
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
+MOD_UPDIR = @MOD_UPDIR@
 
 @SET_MAKE@
 INSTALL = @INSTALL@
@@ -17,8 +18,8 @@
 STRIP = @STRIP@
 CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
-MOD_CFLAGS = @CFLAGS@ -I. -I../../.. -I../$(top_srcdir) \
-  -I../$(top_srcdir)/src/mod @DEFS@ $(CFLGS)
+MOD_CFLAGS = @CFLAGS@ -I. -I../../.. -I$(MOD_UPDIR)$(top_srcdir) \
+  -I$(MOD_UPDIR)$(top_srcdir)/src/mod @DEFS@ $(CFLGS)
 MOD_CPPFLAGS = @CPPFLAGS@
 XLIBS = @XLIBS@
 MOD_EXT = @MOD_EXT@
@@ -59,14 +60,14 @@
 	if test ! -r $*.mod/Makefile; then \
 		cp $(srcdir)/$*.mod/Makefile $*.mod/Makefile; \
 	fi; \
-	cd $*.mod && $(MAKE_MOD) 'VPATH=../$(srcdir)/$*.mod' 'srcdir=../$(srcdir)/$*.mod' 'MAKE=$(MAKE)' modules;
+	cd $*.mod && $(MAKE_MOD) 'VPATH=$(MOD_UPDIR)$(srcdir)/$*.mod' 'srcdir=$(MOD_UPDIR)$(srcdir)/$*.mod' 'MAKE=$(MAKE)' modules;
 
 .mod.mod_o:
 	@if test ! -d $*.mod; then mkdir $*.mod; fi; \
 	if test ! -r $*.mod/Makefile; then \
 		cp $(srcdir)/$*.mod/Makefile $*.mod/Makefile; \
 	fi; \
-	cd $*.mod && $(MAKE_MOD) 'VPATH=../$(srcdir)/$*.mod' 'srcdir=../$(srcdir)/$*.mod' 'MAKE=$(MAKE)' static;
+	cd $*.mod && $(MAKE_MOD) 'VPATH=$(MOD_UPDIR)$(srcdir)/$*.mod' 'srcdir=$(MOD_UPDIR)$(srcdir)/$*.mod' 'MAKE=$(MAKE)' static;
 
 depend:
 	@for i in $(mods); do \
@@ -74,7 +75,7 @@
 		if test ! -r $$i/Makefile; then \
 			cp $(srcdir)/$$i/Makefile $$i/Makefile; \
 		fi; \
-		(cd $$i && $(MAKE_MOD) "VPATH=../$(srcdir)/$$i" "srcdir=../$(srcdir)/$$i" depend); \
+		(cd $$i && $(MAKE_MOD) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" depend); \
 	done
 
 config:
@@ -85,7 +86,7 @@
 			echo "Configuring module $${modname} ..."; \
 			echo ""; \
 			if test ! -d $$i; then mkdir $$i; fi; \
-			(cd $$i && ../$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=../$(top_srcdir)/src/mod/$$i); \
+			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
 		fi; \
 	done; \
 	echo ""
@@ -99,7 +100,7 @@
 			cp $(srcdir)/$$i/Makefile $$i/Makefile; \
 		fi; \
 		if (test -r $$i/Makefile); then \
-			(cd $$i; $(MAKE) "VPATH=../$(srcdir)/$$i" "srcdir=../$(srcdir)/$$i" 'MAKE=$(MAKE)' clean); \
+			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' clean); \
 		fi; \
 	done
 
@@ -112,7 +113,7 @@
 			cp $(srcdir)/$$i/Makefile $$i/Makefile; \
 		fi; \
 		if (test -r $$i/Makefile); then \
-			(cd $$i; $(MAKE) "VPATH=../$(srcdir)/$$i" "srcdir=../$(srcdir)/$$i" 'MAKE=$(MAKE)' distclean); \
+			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' distclean); \
 		fi; \
 	done
 
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.404 eggdrop1.6/src/patch.h:1.405
--- eggdrop1.6/src/patch.h:1.404	Thu Dec 21 14:12:43 2000
+++ eggdrop1.6/src/patch.h	Thu Dec 21 14:20:03 2000
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  * 
- * $Id: patch.h,v 1.404 2000/12/21 20:12:43 guppy Exp $
+ * $Id: patch.h,v 1.405 2000/12/21 20:20:03 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("977428989");		/* current unixtime */
+patch("977429770");		/* current unixtime */
 /*
  *
  *
  */
-patch("sharefix");
+patch("configurefix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list