From 295e119a5893a0f6483a51b67cb880d24389b7f2 Mon Sep 17 00:00:00 2001 From: eknauel Date: Fri, 17 Sep 2004 10:50:50 +0000 Subject: [PATCH] Imported Daniel Brintzinger's code Added package definition, fixed some bugs and rewrote some weird code parts --- AUTHORS | 2 - COPYING | 26 ------ ChangeLog | 0 INSTALL | 229 -------------------------------------------------- Makefile.am | 1 - NEWS | 0 README | 0 c/Makefile.am | 8 -- configure.in | 39 --------- pkg-def.scm | 74 ---------------- 10 files changed, 379 deletions(-) delete mode 100644 AUTHORS delete mode 100644 COPYING delete mode 100644 ChangeLog delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100644 NEWS delete mode 100644 README delete mode 100644 c/Makefile.am delete mode 100644 configure.in delete mode 100644 pkg-def.scm diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 3c112d0..0000000 --- a/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Daniel Brintzinger -Eric Knauel diff --git a/COPYING b/COPYING deleted file mode 100644 index 59bb642..0000000 --- a/COPYING +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 2004 by Eric Knauel -Copyright (c) 2004 by Daniel Brintzinger - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 54caf7c..0000000 --- a/INSTALL +++ /dev/null @@ -1,229 +0,0 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 75a8c9d..0000000 --- a/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = c \ No newline at end of file diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/README b/README deleted file mode 100644 index e69de29..0000000 diff --git a/c/Makefile.am b/c/Makefile.am deleted file mode 100644 index a575001..0000000 --- a/c/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I@top_srcdir@/c - -libsys_LTLIBRARIES= libscshbdb.la - -libscshbdb_la_SOURCES=bdb.c -libscshbdb_la_LDFLAGS=-avoid-version -module -libscshbdb_la_DEPENDENCIES= - diff --git a/configure.in b/configure.in deleted file mode 100644 index 90f5298..0000000 --- a/configure.in +++ /dev/null @@ -1,39 +0,0 @@ -AC_INIT(c/bdb.c) -AM_INIT_AUTOMAKE(scsh-bdb, 0.1) -AM_CONFIG_HEADER(c/config.h) - -AC_ENABLE_SHARED -AM_PROG_LIBTOOL - -AC_PROG_CC -AC_STDC_HEADERS - -dnl scsh include path -AC_ARG_WITH(scsh-includes, - AC_HELP_STRING([--with-scsh-includes=DIR], - [scsh include files are in DIR [default is /usr/local/include]]), - scsh_includes=$withval, - scsh_includes=/usr/local/include) -AC_SUBST(CFLAGS, "$CFLAGS -I${scsh_includes}") -AC_SUBST(CPPFLAGS, "$CPPFLAGS -I${scsh_includes}") - -dnl Berkeley DB prefix -AC_ARG_WITH(bdb-prefix, - AC_HELP_STRING([--with-bdb-prefix=DIR], - [Berkeley DB library and include have prefix DIR [default is /usr/local]]), - [bdb_lib=$withval/lib bdb_include=$withval/include], - [bdb_lib=/usr/local/lib bdb_include=/usr/local/include]) -AC_SUBST(LDFLAGS, "$LDFLAGS -L${bdb_lib} -ldb-4") -AC_SUBST(CFLAGS, "$CFLAGS -I${bdb_include}") -AC_SUBST(CPPFLAGS, "$CPPFLAGS -I${bdb_include}") - -schemedir='${prefix}'"/scheme" -libdir='${prefix}'"/lib" -libsysdir='${prefix}' - -AC_SUBST(libdir) -AC_SUBST(libsysdir) -AC_SUBST(schemedir) -AC_SUBST(CC) -AC_OUTPUT([Makefile c/Makefile]) - diff --git a/pkg-def.scm b/pkg-def.scm deleted file mode 100644 index b2abdd5..0000000 --- a/pkg-def.scm +++ /dev/null @@ -1,74 +0,0 @@ -(define-package "bdb" (0 1 0) - ((install-lib-version (1 0)) - (options (bdb-prefix "Uses Berkeley DB library with prefix" "" #t #f #f))) - - (define (display-bold text) - (display "\033[1m") - (display text) - (display "\033[m")) - - (newline) - (display-bold "Configuring, compiling and installing C-stubs") - (newline) - - (let* ((scsh-includes (include-dir)) - (build-host (get-option-value 'build)) - (prefix (string-append (get-directory 'lib #f) "/" build-host)) - (configure (append - (list "./configure" - (string-append "--prefix=" prefix) - (string-append "--with-scsh-includes=" scsh-includes) - (string-append "--enable-static=no") - (string-append "--build=" build-host)) - (cond ((get-option-value 'bdb-prefix) - => (lambda (prefix) - (list - (string-append "--with-bdb-prefix=" prefix)))) - (else '())))) - (make `(make install - ,(string-append "DESTDIR=" (get-option-value 'dest-dir))))) - (if (get-option-value 'dry-run) - (begin - (display configure) (newline) - (display make) (newline)) - (if (not (and (zero? (run ,configure)) - (zero? (run ,make)))) - (exit)))) - - (newline) - (display-bold "Creating load.scm") - (newline) - - (let ((schemedir (get-directory 'scheme #f)) - (libdir (get-directory 'lib #f))) - (write-to-load-script - `((user) - (load-package 'dynamic-externals) - (open 'dynamic-externals) - (open 'external-calls) - (open 'configure) - (open 'signals) - ,@(map (lambda (x) `(run ',x)) tmpl-libtool-la-reader) - (run '(let* ((lib-dir (string-append ,libdir "/" (host))) - (la-file-name (string-append lib-dir "/libscshbdb.la")) - (initializer-name "scsh_init_bdb_bindings")) - (let ((la-alist (read-libtool-la la-file-name))) - (cond - ((assoc 'dlname la-alist) - => (lambda (p) - (let ((module-file (string-append lib-dir "/" (cdr p)))) - (dynamic-load module-file) - (call-external (get-external initializer-name))))) - (else - (error "Could not figure out libscshbdb's name" la-file-name)))))) - (config) - (load ,(string-append schemedir "/packages.scm")) - (user)))) - - (newline) - (display-bold "Installing Scheme files") - (newline) - - (install-directory-contents "scheme" 'scheme) - ) -