switch back to static

pull/37/merge
tstack 15 years ago
parent 3f6212766a
commit 96f097ff2c

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.10.2 from Makefile.am. # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -182,7 +182,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I . ACLOCAL_AMFLAGS = -I .
@ -302,7 +301,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique mkid -fID $$unique
tags: TAGS tags: TAGS

113
aclocal.m4 vendored

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.10.2 -*- Autoconf -*- # generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@ -13,13 +13,13 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, m4_if(AC_AUTOCONF_VERSION, [2.61],,
[m4_warning([this file was generated for autoconf 2.63. [m4_warning([this file was generated for autoconf 2.61.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
# #
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10' [am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.10.2], [], m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -48,12 +48,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION # AM_SET_CURRENT_AUTOMAKE_VERSION
# ------------------------------- # -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.10.2])dnl [AM_AUTOMAKE_VERSION([1.10.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
@ -303,68 +303,57 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*- # Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# #
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
#serial 5 #serial 3
# _AM_OUTPUT_DEPENDENCY_COMMANDS # _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------ # ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{ [for mf in $CONFIG_FILES; do
# Autoconf 2.62 quotes --file arguments for eval, but not when files # Strip MF so we end up with the name of the file.
# are listed without --file. Let's play safe and only enable the eval mf=`echo "$mf" | sed -e 's/:.*$//'`
# if we detect the quoting. # Check whether this is an Automake generated Makefile or not.
case $CONFIG_FILES in # We used to match only the files named `Makefile.in', but
*\'*) eval set x "$CONFIG_FILES" ;; # some people rename them; so instead we look at the file content.
*) set x $CONFIG_FILES ;; # Grep'ing the first line is not enough: some people post-process
esac # each Makefile.in and add a new line on top of each file to say so.
shift # Grep'ing the whole file is not good either: AIX grep has a line
for mf # limit of 2048, but all sed's we know have understand at least 4000.
do if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
# Strip MF so we end up with the name of the file. dirpart=`AS_DIRNAME("$mf")`
mf=`echo "$mf" | sed -e 's/:.*$//'` else
# Check whether this is an Automake generated Makefile or not. continue
# We used to match only the files named `Makefile.in', but fi
# some people rename them; so instead we look at the file content. # Extract the definition of DEPDIR, am__include, and am__quote
# Grep'ing the first line is not enough: some people post-process # from the Makefile without running `make'.
# each Makefile.in and add a new line on top of each file to say so. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
# Grep'ing the whole file is not good either: AIX grep has a line test -z "$DEPDIR" && continue
# limit of 2048, but all sed's we know have understand at least 4000. am__include=`sed -n 's/^am__include = //p' < "$mf"`
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then test -z "am__include" && continue
dirpart=`AS_DIRNAME("$mf")` am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
else # When using ansi2knr, U may be empty or an underscore; expand it
continue U=`sed -n 's/^U = //p' < "$mf"`
fi # Find all dependency output files, they are included files with
# Extract the definition of DEPDIR, am__include, and am__quote # $(DEPDIR) in their names. We invoke sed twice because it is the
# from the Makefile without running `make'. # simplest approach to changing $(DEPDIR) to its actual value in the
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` # expansion.
test -z "$DEPDIR" && continue for file in `sed -n "
am__include=`sed -n 's/^am__include = //p' < "$mf"` s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
test -z "am__include" && continue sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Make sure the directory exists.
# When using ansi2knr, U may be empty or an underscore; expand it test -f "$dirpart/$file" && continue
U=`sed -n 's/^U = //p' < "$mf"` fdir=`AS_DIRNAME(["$file"])`
# Find all dependency output files, they are included files with AS_MKDIR_P([$dirpart/$fdir])
# $(DEPDIR) in their names. We invoke sed twice because it is the # echo "creating $dirpart/$file"
# simplest approach to changing $(DEPDIR) to its actual value in the echo '# dummy' > "$dirpart/$file"
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done done
} done
])# _AM_OUTPUT_DEPENDENCY_COMMANDS ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@ -670,13 +659,13 @@ esac
# Helper functions for option handling. -*- Autoconf -*- # Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
# #
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
# serial 4 # serial 3
# _AM_MANGLE_OPTION(NAME) # _AM_MANGLE_OPTION(NAME)
# ----------------------- # -----------------------
@ -693,7 +682,7 @@ AC_DEFUN([_AM_SET_OPTION],
# ---------------------------------- # ----------------------------------
# OPTIONS is a space-separated list of Automake options. # OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# ------------------------------------------- # -------------------------------------------

3553
configure vendored

File diff suppressed because it is too large Load Diff

@ -24,7 +24,8 @@ endif
AM_LDFLAGS = \ AM_LDFLAGS = \
$(SQLITE3_LDFLAGS) \ $(SQLITE3_LDFLAGS) \
-pthread -pthread \
-static
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-Wall \ -Wall \

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.10.2 from Makefile.am. # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -196,7 +196,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
noinst_LIBRARIES = libdiag.a noinst_LIBRARIES = libdiag.a
@ -206,7 +205,8 @@ noinst_LIBRARIES = libdiag.a
@HAVE_OBJ_FORMAT_TRUE@HELP_SRC = @HAVE_OBJ_FORMAT_TRUE@HELP_SRC =
AM_LDFLAGS = \ AM_LDFLAGS = \
$(SQLITE3_LDFLAGS) \ $(SQLITE3_LDFLAGS) \
-pthread -pthread \
-static
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-Wall \ -Wall \
@ -281,8 +281,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& { if test -f $@; then exit 0; else break; fi; }; \ && exit 0; \
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
@ -400,7 +400,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique mkid -fID $$unique
tags: TAGS tags: TAGS

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.10.2 from Makefile.am. # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@ -256,7 +256,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
TESTS_ENVIRONMENT = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT TESTS_ENVIRONMENT = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
@ -371,8 +370,8 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& { if test -f $@; then exit 0; else break; fi; }; \ && exit 0; \
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
@ -647,7 +646,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique mkid -fID $$unique
tags: TAGS tags: TAGS
@ -690,7 +689,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS) check-TESTS: $(TESTS)
@failed=0; all=0; xfail=0; xpass=0; skip=0; \ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
srcdir=$(srcdir); export srcdir; \ srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \ list=' $(TESTS) '; \
if test -n "$$list"; then \ if test -n "$$list"; then \
@ -701,7 +700,7 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \ all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \ case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \ *$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \ xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \ failed=`expr $$failed + 1`; \
echo "XPASS: $$tst"; \ echo "XPASS: $$tst"; \
@ -713,7 +712,7 @@ check-TESTS: $(TESTS)
elif test $$? -ne 77; then \ elif test $$? -ne 77; then \
all=`expr $$all + 1`; \ all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \ case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \ *$$ws$$tst$$ws*) \
xfail=`expr $$xfail + 1`; \ xfail=`expr $$xfail + 1`; \
echo "XFAIL: $$tst"; \ echo "XFAIL: $$tst"; \
;; \ ;; \
@ -727,36 +726,23 @@ check-TESTS: $(TESTS)
echo "SKIP: $$tst"; \ echo "SKIP: $$tst"; \
fi; \ fi; \
done; \ done; \
if test "$$all" -eq 1; then \
tests="test"; \
All=""; \
else \
tests="tests"; \
All="All "; \
fi; \
if test "$$failed" -eq 0; then \ if test "$$failed" -eq 0; then \
if test "$$xfail" -eq 0; then \ if test "$$xfail" -eq 0; then \
banner="$$All$$all $$tests passed"; \ banner="All $$all tests passed"; \
else \ else \
if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
fi; \ fi; \
else \ else \
if test "$$xpass" -eq 0; then \ if test "$$xpass" -eq 0; then \
banner="$$failed of $$all $$tests failed"; \ banner="$$failed of $$all tests failed"; \
else \ else \
if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
fi; \ fi; \
fi; \ fi; \
dashes="$$banner"; \ dashes="$$banner"; \
skipped=""; \ skipped=""; \
if test "$$skip" -ne 0; then \ if test "$$skip" -ne 0; then \
if test "$$skip" -eq 1; then \ skipped="($$skip tests were not run)"; \
skipped="($$skip test was not run)"; \
else \
skipped="($$skip tests were not run)"; \
fi; \
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \ dashes="$$skipped"; \
fi; \ fi; \

Loading…
Cancel
Save