made it possible to compile modules outside of source tree

Rev: src/Makefile.in:1.117
Rev: src/aclocal.m4:1.1
Rev: src/modules/Gdbm/configure.in:1.3
Rev: src/modules/Gmp/configure.in:1.4
Rev: src/modules/Gz/configure.in:1.12
Rev: src/modules/Image/configure.in:1.9
Rev: src/modules/Image/encodings/configure.in:1.5
Rev: src/modules/MIME/configure.in:1.4
Rev: src/modules/Msql/configure.in:1.4
Rev: src/modules/Mysql/configure.in:1.6
Rev: src/modules/Odbc/configure.in:1.11
Rev: src/modules/Oracle/configure.in:1.12
Rev: src/modules/Pipe/configure.in:1.6
Rev: src/modules/Postgres/configure.in:1.8
Rev: src/modules/Regexp/configure.in:1.6
Rev: src/modules/Ssleay/configure.in:1.5
Rev: src/modules/Yp/configure.in:1.8
Rev: src/modules/_Crypto/configure.in:1.6
Rev: src/modules/_Image_JPEG/configure.in:1.4
Rev: src/modules/_Image_XFace/configure.in:1.3
Rev: src/modules/call_out/configure.in:1.6
Rev: src/modules/dynamic_module_makefile.in:1.44
Rev: src/modules/files/configure.in:1.59
Rev: src/modules/math/configure.in:1.7
Rev: src/modules/readline/configure.in:1.4
Rev: src/modules/spider/configure.in:1.24
Rev: src/modules/sprintf/configure.in:1.5
Rev: src/modules/static_module_makefile.in:1.37
Rev: src/modules/system/configure.in:1.28
Rev: src/pike-module.in:1.1
Rev: src/run_autoconfig:1.23

.gitattributes

@@ -80,6 +80,7 @@ testfont binary
 /man/pike.1 foreign_ident
 /src/Makefile.in foreign_ident
 /src/acconfig.h foreign_ident
+/src/aclocal.m4 foreign_ident
 /src/alloca.c foreign_ident
 /src/array.c foreign_ident
 /src/array.h foreign_ident

src/Makefile.in

 #
-# $Id: Makefile.in,v 1.116 1998/09/05 15:20:39 grubba Exp $
+# $Id: Makefile.in,v 1.117 1998/09/20 08:30:31 hubbe Exp $
 #
 
 # This line is needed on some machines.
@@ -201,7 +201,7 @@ interpret.o: $(SRCDIR)/interpret.c
 force :
 
 # install
-install: pike hilfe
+install: pike hilfe pike-module aclocal
 	@echo
 	@echo Installing Pike...
 	@echo
@@ -260,12 +260,29 @@ install: pike hilfe
 	    chmod u+w "$(exec_prefix)/hilfe"; \
 	  fi; \
 	else : ; fi
+	@if [ -f ./pike-module ]; then \
+	  echo ; echo "Installing pike-module..."; \
+	  if cmp "$(exec_prefix)/pike-module" ./pike-module >/dev/null 2>&1 ; \
+	  then \
+	    echo "$(exec_prefix)/pike-module already installed." ; \
+	  else \
+	    if [ -f "$(exec_prefix)/pike-module" ]; then \
+	      mv "$(exec_prefix)/pike-module" "$(exec_prefix)/pike-module.old" || exit 1; \
+	    else : ; fi; \
+	    echo "$(exec_prefix)/pike-module"; \
+	    $(INSTALL) ./pike-module "$(exec_prefix)" || exit 1; \
+	    chmod a+rx "$(exec_prefix)/pike-module"; \
+	    chmod u+w "$(exec_prefix)/pike-module"; \
+	  fi; \
+	else : ; fi
 	@echo ; echo "Installing header-files..."; \
 	for a in $(SRCDIR)/*.h *.h ; do \
 	  $(INSTALL) $$a "$(prefix)/include/pike" || exit 1; \
 	  chmod a+r "$(prefix)/include/pike" ; \
 	  chmod u+w "$(prefix)/include/pike" ; \
 	done
+	@$(INSTALL) modules/dynamic_module_makefile $(prefix)/include/pike/dynamic_module_makefile
+	@$(INSTALL) ./aclocal $(prefix)/include/pike/aclocal.m4
 	@echo ; echo "Installing modules written in Pike..."; \
 	for f in `cd "$(LIBDIR_SRC)"; find . -type f -print | grep -v '/CVS/'`; do \
 	  if cmp "$(share_prefix)/$$f" "$(LIBDIR_SRC)/$$f" >/dev/null 2>&1 ; \
@@ -408,6 +425,19 @@ master.pike: $(LIBDIR_SRC)/master.pike.in Makefile
 	sed -e 's!lib_prefix!$(TMP_LIBDIR)!' <$(LIBDIR_SRC)/master.pike.in \
 	  | sed -e 's!share_prefix!$(LIBDIR_SRC)!' >master.pike
 
+pike-module: $(SRCDIR)/pike-module.in Makefile ./pike
+	$(RUNPIKE) $(SRCDIR)/pike-module.in --fixate=$(SRCDIR)/pike-module.in \
+	   --set='make=$(MAKE)' --set='make_flags=$(MAKE_FLAGS)' \
+	   --set='prefix=$(prefix)' --set='pike=$(exec_prefix)/pike' \
+	   --set='include_path=$(prefix)/include/pike' \
+	   --set='lib_prefix=$(TMP_LIBDIR)' --set='share_prefix=$(LIBDIR_SRC)' \
+           --output=pike-module
+	-@chmod +x pike-module
+
+aclocal: $(SRCDIR)/aclocal.m4
+	echo >aclocal "define(PIKE_INCLUDE_PATH,$(prefix)/include/pike)"
+	cat >>aclocal $(SRCDIR)/aclocal.m4
+
 # make export archive (requires compiled Pike)
 # Do not compile in source tree if you want to use this!
 # Beware that export archive this includes bison/yacc/byacc source

src/aclocal.m4

+define([AC_LOW_MODULE_INIT],
+[
+# $Id: aclocal.m4,v 1.1 1998/09/20 08:30:31 hubbe Exp $
+
+AC_PROG_CC
+AC_DEFINE(POSIX_SOURCE)
+AC_SUBST_FILE(dependencies)
+dependencies=$srcdir/dependencies
+
+AC_SUBST_FILE(dynamic_module_makefile)
+AC_SUBST_FILE(static_module_makefile)
+])
+
+
+define([AC_MODULE_INIT],
+[
+AC_LOW_MODULE_INIT()
+
+ifdef([PIKE_INCLUDE_PATH],
+[
+dynamic_module_makefile=PIKE_INCLUDE_PATH/dynamic_module_makefile
+static_module_makefile=PIKE_INCLUDE_PATH/dynamic_module_makefile
+],[
+dynamic_module_makefile=../dynamic_module_makefile
+static_module_makefile=../static_module_makefile
+
+counter=.
+
+while test ! -f "$dynamic_module_makefile"
+do
+  counter=.$counter
+  if test $counter = .......... ; then
+    exit 1
+  else
+    :
+  fi
+  dynamic_module_makefile=../$dynamic_module_makefile
+  static_module_makefile=../$static_module_makefile
+done
+])
+])

src/modules/Gdbm/configure.in

-# $Id: configure.in,v 1.2 1998/03/28 14:55:20 grubba Exp $
+# $Id: configure.in,v 1.3 1998/09/20 08:30:50 hubbe Exp $
 AC_INIT(gdbmmod.c)
 AC_CONFIG_HEADER(gdbm_machine.h)
 
 AC_ARG_WITH(gdbm,    [  --with(out)-gdbm       GNU database manager support ],[],[with_gdbm=yes])
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 if test x$with_gdbm = xyes; then
   AC_CHECK_HEADERS(gdbm.h)

src/modules/Gmp/configure.in

-# $Id: configure.in,v 1.3 1998/07/11 15:56:18 grubba Exp $
+# $Id: configure.in,v 1.4 1998/09/20 08:30:58 hubbe Exp $
 AC_INIT(mpz_glue.c)
 AC_CONFIG_HEADER(gmp_machine.h)
 AC_ARG_WITH(gmp,     [  --with(out)-gmp        Support bignums],[],[with_gmp=yes])
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 if test x$with_gmp = xyes ; then
   AC_CHECK_HEADERS(gmp2/gmp.h)

src/modules/Gz/configure.in

-# $Id: configure.in,v 1.11 1998/07/18 00:07:05 grubba Exp $
+# $Id: configure.in,v 1.12 1998/09/20 08:31:07 hubbe Exp $
 AC_INIT(zlibmod.c)
 AC_CONFIG_HEADER(zlib_machine.h)
 AC_ARG_WITH(zlib,     [  --with(out)-zlib       Support gzip compression],[],[with_zlib=yes])
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 if test x$with_zlib = xyes ; then
   AC_CHECK_HEADERS(zlib.h)

src/modules/Image/configure.in

-# $Id: configure.in,v 1.8 1998/03/28 14:48:42 grubba Exp $
+# $Id: configure.in,v 1.9 1998/09/20 08:31:15 hubbe Exp $
 AC_INIT(image.c)
 AC_CONFIG_HEADER(config.h)
 
 AC_SET_MAKE
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_FUNC_MMAP
 

src/modules/Image/encodings/configure.in

-# $Id: configure.in,v 1.4 1998/03/28 14:47:34 grubba Exp $
+# $Id: configure.in,v 1.5 1998/09/20 08:31:22 hubbe Exp $
 AC_INIT(gif.c)
 
 AC_SET_MAKE
 
-sinclude(../../module_configure.in)
+AC_MODULE_INIT()
 
 AC_PROG_RANLIB
 AC_SUBST(RANLIB)

src/modules/MIME/configure.in

-# $Id: configure.in,v 1.3 1998/03/28 14:46:31 grubba Exp $
+# $Id: configure.in,v 1.4 1998/09/20 08:31:29 hubbe Exp $
 AC_INIT(mime.c)
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_C_CHAR_UNSIGNED
 

src/modules/Msql/configure.in

-dnl $Id: configure.in,v 1.3 1998/07/15 19:03:07 grubba Exp $
+dnl $Id: configure.in,v 1.4 1998/09/20 08:31:37 hubbe Exp $
 dnl (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 AC_INIT(msqlmod.c)
@@ -9,7 +9,7 @@ AC_ARG_WITH(msql,    [  --with(out)-msql      mSQL Database engine support ],[]
 
 echo "Configuring msql module, (C) 1996,1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>"
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 dnl set up "reasonable" search paths
 pike_msql_reasonable_prefixes="/usr/local /usr /opt"

src/modules/Mysql/configure.in

 #
-# $Id: configure.in,v 1.5 1998/09/01 17:01:04 hubbe Exp $
+# $Id: configure.in,v 1.6 1998/09/20 08:31:46 hubbe Exp $
 #
 # Configure script for the mysql-module
 #
@@ -20,7 +20,7 @@
 AC_INIT(mysql.c)
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 OLD_LIBS=$LIBS
 OLD_LDFLAGS=$LDFLAGS

src/modules/Odbc/configure.in

 #
-# $Id: configure.in,v 1.10 1998/07/13 02:01:40 mast Exp $
+# $Id: configure.in,v 1.11 1998/09/20 08:31:55 hubbe Exp $
 #
 # Configure script for the odbc-module
 #
@@ -9,7 +9,7 @@
 AC_INIT(odbc.c)
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 OLD_LIBS=$LIBS
 OLD_LDFLAGS=$LDFLAGS

src/modules/Oracle/configure.in

 #
-# $Id: configure.in,v 1.11 1998/05/23 23:10:02 grubba Exp $
+# $Id: configure.in,v 1.12 1998/09/20 08:32:03 hubbe Exp $
 #
 # Configure script for the oracle module
 #
@@ -7,7 +7,7 @@
 AC_INIT(oracle.c)
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 ORACLE_LIBS=""
 

src/modules/Pipe/configure.in

-# $Id: configure.in,v 1.5 1998/05/17 18:53:28 grubba Exp $
+# $Id: configure.in,v 1.6 1998/09/20 08:32:11 hubbe Exp $
 AC_INIT(pipe.c)
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_HAVE_HEADERS(sys/mman.h linux/mman.h sys/file.h)
 AC_HAVE_FUNCS(mmap munmap geteuid seteuid setresuid madvise)

src/modules/Postgres/configure.in

-dnl $Id: configure.in,v 1.7 1998/08/25 13:11:50 grubba Exp $
+dnl $Id: configure.in,v 1.8 1998/09/20 08:32:20 hubbe Exp $
 dnl (C) 1997 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 
 AC_INIT(postgres.c)
@@ -16,7 +16,7 @@ AC_ARG_WITH(libpq-dir,
 	[  --with-libpq-dir=dir               look for library-files in dir],
 	[pike_postgres_user_lib_directory=$withval])
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 ac_pike_postgres_skip=no
 

src/modules/Regexp/configure.in

-# $Id: configure.in,v 1.5 1998/03/28 14:37:15 grubba Exp $
+# $Id: configure.in,v 1.6 1998/09/20 08:32:28 hubbe Exp $
 AC_INIT(pike_regexp.c)
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_HAVE_HEADERS(string.h)
 dnl

src/modules/Ssleay/configure.in

-# $Id: configure.in,v 1.4 1998/03/28 14:33:55 grubba Exp $
+# $Id: configure.in,v 1.5 1998/09/20 08:32:36 hubbe Exp $
 AC_INIT(ssleay.c)
 
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_ARG_WITH(ssleay,  [  --with-ssleay       enable the ssleay-module],[],[with_ssleay=no])
 

src/modules/Yp/configure.in

-# $Id: configure.in,v 1.7 1998/08/08 20:28:50 grubba Exp $
+# $Id: configure.in,v 1.8 1998/09/20 08:32:45 hubbe Exp $
 AC_INIT(yp.c)
 AC_CONFIG_HEADER(config.h)
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_CHECK_LIB(nsl, gethostbyname)
 

src/modules/_Crypto/configure.in

-# $Id: configure.in,v 1.5 1998/03/28 14:28:56 grubba Exp $
+# $Id: configure.in,v 1.6 1998/09/20 08:32:53 hubbe Exp $
 AC_INIT(crypto.c)
 
 AC_SET_MAKE
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 AC_CONFIG_SUBDIRS(lib)
 

src/modules/_Image_JPEG/configure.in

 #
-# $Id: configure.in,v 1.3 1998/03/28 13:44:57 grubba Exp $
+# $Id: configure.in,v 1.4 1998/09/20 08:33:00 hubbe Exp $
 #
 AC_INIT(image_jpeg.c)
 AC_CONFIG_HEADER(config.h)
 AC_ARG_WITH(jpeglib,     [  --with(out)-jpeglib       Support JPEG (Image.JPEG)],[],[with_jpeglib=yes])
 
-sinclude(../module_configure.in)
+AC_MODULE_INIT()
 
 if test x$with_jpeglib = xyes ; then
   AC_CHECK_HEADERS(jpeglib.h)