From c70f0ffb8098c2eaa30850257785345b5556c98c Mon Sep 17 00:00:00 2001 From: brianb Date: Sun, 15 Apr 2001 23:17:27 +0000 Subject: [PATCH] clean up --- Makefile.am | 5 ++ config.log | 60 ---------------- config.status | 188 -------------------------------------------------- configure.in | 3 +- 4 files changed, 6 insertions(+), 250 deletions(-) delete mode 100644 config.log delete mode 100755 config.status diff --git a/Makefile.am b/Makefile.am index e69de29..d3a6820 100644 --- a/Makefile.am +++ b/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = src + +DEFDIR = $(prefix) + +EXTRA_DIST = HACKING diff --git a/config.log b/config.log deleted file mode 100644 index de1fbf0..0000000 --- a/config.log +++ /dev/null @@ -1,60 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -configure:566: checking for a BSD compatible install -configure:619: checking whether build environment is sane -configure:676: checking whether make sets ${MAKE} -configure:722: checking for working aclocal -configure:735: checking for working autoconf -configure:748: checking for working automake -configure:761: checking for working autoheader -configure:774: checking for working makeinfo -configure:791: checking for gcc -configure:904: checking whether the C compiler (gcc ) works -configure:920: gcc -o conftest conftest.c 1>&5 -configure:946: checking whether the C compiler (gcc ) is a cross-compiler -configure:951: checking whether we are using GNU C -configure:979: checking whether gcc accepts -g -configure:1011: checking whether make sets ${MAKE} -configure:1040: checking for ranlib -configure:1143: checking host system type -configure:1164: checking build system type -configure:1193: checking for ld used by GCC -configure:1256: checking if the linker (/usr/bin/ld) is GNU ld -configure:1272: checking for BSD-compatible nm -configure:1309: checking whether ln -s works -ltconfig:603: checking for object suffix -ltconfig:604: gcc -c -g -O2 conftest.c 1>&5 -ltconfig:776: checking if gcc PIC flag -fPIC works -ltconfig:777: gcc -c -g -O2 -fPIC -DPIC conftest.c 1>&5 -ltconfig:829: checking if gcc supports -c -o file.o -ltconfig:830: gcc -c -g -O2 -o out/conftest2.o conftest.c 1>&5 -ltconfig:862: checking if gcc supports -c -o file.lo -ltconfig:863: gcc -c -g -O2 -c -o conftest.lo conftest.c 1>&5 -ltconfig:914: checking if gcc supports -fno-rtti -fno-exceptions -ltconfig:915: gcc -c -g -O2 -fno-rtti -fno-exceptions -c conftest.c conftest.c 1>&5 -ltconfig:958: checking if gcc static flag -static works -ltconfig:959: gcc -o conftest -g -O2 -static conftest.c 1>&5 -GNU ld version 2.10.90 (with BFD 2.10.0.18) -ltconfig:1592: checking if global_symbol_pipe works -ltconfig:1593: gcc -c -g -O2 conftest.c 1>&5 -ltconfig:1596: eval "/usr/bin/nm -B conftest.o | sed -n -e 's/^.*[ ]\([ABCDGISTW]\)[ ][ ]*\(\)\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2\3 \3/p' > conftest.nm" -ltconfig:1648: gcc -o conftest -g -O2 -fno-builtin -fno-rtti -fno-exceptions conftest.c conftstm.o 1>&5 -configure:1489: checking how to run the C preprocessor -configure:1574: checking for flex -configure:1607: checking for flex -configure:1641: checking for yywrap in -lfl -configure:1683: checking lex output file root -configure:1704: checking whether yytext is a pointer -configure:1749: checking for bison -configure:1781: checking for main in -libs -configure:1824: checking for mdb_free_handle in -lmdb -configure:1872: checking for ANSI C header files -configure:1979: checking for fcntl.h -configure:1979: checking for limits.h -configure:1979: checking for unistd.h -configure:2017: checking for working const -configure:2092: checking for size_t -configure:2126: checking whether byte ordering is bigendian -configure:2220: checking for initscr in -lncurses -configure:2264: checking for add_history in -lreadline diff --git a/config.status b/config.status deleted file mode 100755 index c7369fc..0000000 --- a/config.status +++ /dev/null @@ -1,188 +0,0 @@ -#! /bin/sh -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host localhost.localdomain: -# -# ./configure -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]" -for ac_option -do - case "$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion" - exec ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "./config.status generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "$ac_cs_usage"; exit 0 ;; - *) echo "$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=. -ac_given_INSTALL="/usr/bin/install -c" - -trap 'rm -fr src/util/Makefile src/extras/Makefile Makefile config/Makfile src/Makefile src/libmdb/Makefile include/Makefile src/sql/Makefile conftest*; exit 1' 1 2 15 - -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g; - s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF -/^[ ]*VPATH[ ]*=[^:]*$/d - -s%@SHELL@%/bin/sh%g -s%@CFLAGS@%-g -O2%g -s%@CPPFLAGS@%%g -s%@CXXFLAGS@%%g -s%@FFLAGS@%%g -s%@DEFS@% -DPACKAGE=\"mdbtools\" -DVERSION=\"0.3\" -DYYTEXT_POINTER=1 -DHAVE_LIBMDB=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_READLINE=1 %g -s%@LDFLAGS@%%g -s%@LIBS@%-lmdb %g -s%@exec_prefix@%${prefix}%g -s%@prefix@%/usr/local%g -s%@program_transform_name@%s,x,x,%g -s%@bindir@%${exec_prefix}/bin%g -s%@sbindir@%${exec_prefix}/sbin%g -s%@libexecdir@%${exec_prefix}/libexec%g -s%@datadir@%${prefix}/share%g -s%@sysconfdir@%${prefix}/etc%g -s%@sharedstatedir@%${prefix}/com%g -s%@localstatedir@%${prefix}/var%g -s%@libdir@%${exec_prefix}/lib%g -s%@includedir@%${prefix}/include%g -s%@oldincludedir@%/usr/include%g -s%@infodir@%${prefix}/info%g -s%@mandir@%${prefix}/man%g -s%@INSTALL_PROGRAM@%${INSTALL}%g -s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g -s%@INSTALL_DATA@%${INSTALL} -m 644%g -s%@PACKAGE@%mdbtools%g -s%@VERSION@%0.3%g -s%@ACLOCAL@%aclocal%g -s%@AUTOCONF@%autoconf%g -s%@AUTOMAKE@%automake%g -s%@AUTOHEADER@%autoheader%g -s%@MAKEINFO@%makeinfo%g -s%@SET_MAKE@%%g -s%@CC@%gcc%g -s%@RANLIB@%ranlib%g -s%@host@%i686-pc-linux-gnu%g -s%@host_alias@%i686-pc-linux-gnu%g -s%@host_cpu@%i686%g -s%@host_vendor@%pc%g -s%@host_os@%linux-gnu%g -s%@build@%i686-pc-linux-gnu%g -s%@build_alias@%i686-pc-linux-gnu%g -s%@build_cpu@%i686%g -s%@build_vendor@%pc%g -s%@build_os@%linux-gnu%g -s%@LD@%/usr/bin/ld%g -s%@NM@%/usr/bin/nm -B%g -s%@LN_S@%ln -s%g -s%@LIBTOOL@%$(SHELL) $(top_builddir)/libtool%g -s%@LEX@%flex%g -s%@LEXLIB@%-lfl%g -s%@CPP@%gcc -E%g -s%@LEX_OUTPUT_ROOT@%lex.yy%g -s%@YACC@%bison -y%g -s%@READLINE_LIBS@% -lncurses -lreadline%g - -CEOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi - -CONFIG_FILES=${CONFIG_FILES-"src/util/Makefile src/extras/Makefile Makefile config/Makfile src/Makefile src/libmdb/Makefile include/Makefile src/sql/Makefile"} -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - - - -exit 0 diff --git a/configure.in b/configure.in index 691bf26..38ed5c8 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,5 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/extras/mdb-dump.c) -AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE(mdbtools,0.3) AC_PROG_CC(gcc) @@ -45,4 +44,4 @@ LDFLAGS=$OLDLDFLAGS AC_SUBST(READLINE_LIBS) -AC_OUTPUT(src/util/Makefile src/extras/Makefile Makefile config/Makfile src/Makefile src/libmdb/Makefile include/Makefile src/sql/Makefile) +AC_OUTPUT(src/util/Makefile src/extras/Makefile Makefile src/Makefile src/libmdb/Makefile include/Makefile src/sql/Makefile)