[Debtags-commits] [svn] r1090 - in branches/bigmerge/debtags: . debian libdebtags1

[Enrico Zini]

Author: enrico
Date: Fri Aug  5 15:11:56 2005
New Revision: 1090

Removed:
   branches/bigmerge/debtags/debian/libdebtags0.copyright
   branches/bigmerge/debtags/debian/libdebtags0.dirs
   branches/bigmerge/debtags/libdebtags1/
Modified:
   branches/bigmerge/debtags/configure.ac
   branches/bigmerge/debtags/debian/libdebtags.copyright
Log:
Merged configure.ac

Modified: branches/bigmerge/debtags/configure.ac
==============================================================================
--- branches/bigmerge/debtags/configure.ac	(original)
+++ branches/bigmerge/debtags/configure.ac	Fri Aug  5 15:11:56 2005
@@ -1,8 +1,20 @@
+dnl Process this file with autoconf to produce a configure script.
+
 AC_INIT(debtags, 1.3, [enrico at debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
 
+dnl Make it optional to compile the docs, since it's time consuming
+AC_ARG_ENABLE(docs,
+		[  --enable-docs    Turn on generation of documentation],
+		[case "${enableval}" in
+			yes) swig=true ;;
+			no)  swig=false ;;
+			*) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;;
+		esac],[swig=true])
+AM_CONDITIONAL(DO_DOCS, test x$swig = xtrue)
+
 dnl To use subdirs
 AC_PROG_MAKE_SET
 
@@ -15,8 +27,20 @@
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
+dnl Use libtool
+AM_PROG_LIBTOOL
+dnl ..and ranlib
+AC_PROG_RANLIB
+
+dnl Python build system
+AM_PATH_PYTHON
+
+dnl Compute library version info
+LIBDEBTAGS_VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
+AC_SUBST(LIBDEBTAGS_VERSION_INFO)
+
+dnl Use libtagcoll
 LIBTAGCOLL1_DEFS
-LIBDEBTAGS1_DEFS
 
 dnl Directory where the shared databases are kept
 databasedir="$localstatedir/lib/$PACKAGE"
@@ -32,14 +56,46 @@
 bashcompdir="$sysconfdir/bash_completion.d"
 AC_SUBST(bashcompdir)
 
+dnl fn_tagdb = '$(statedir)'/package-tags
+dnl fn_vocab = '$(statedir)'/vocabulary
+dnl fn_dist_vocab = '$(/usr/share/debtags)'/vocabulary
+dnl fn_sources = '$(sysconfigdir)'/debtags/sources.list
+dnl path_cache = '$(localstatedir)'/cache/debtags
+dnl path_tagpatch_d = '$(sysconfigdir)'/debtags/tagpatch.d
+dnl path_tagvoc_d = '$(sysconfigdir)'/debtags/tagvoc.d
+dnl remote_tags_fname = tags-current.gz
+dnl remote_vocab_fname = vocabulary.gz
+
+dnl Look for zlib
+AC_CHECK_HEADER(zlib.h, AC_DEFINE(HAVE_ZLIB_H, 1, zlib.h has been found),
+	AC_MSG_ERROR([
+*** zlib.h not found. Check 'config.log' for more details.]))
+
+AC_CHECK_LIB(z, gzopen, LIBS="-lz $LIBS",
+	AC_MSG_ERROR([
+*** libz not found. Check 'config.log' for more details.]))
+
 dnl Look for apt-get
 AC_PATH_PROG(APTGET, apt-get, /usr/bin/apt-get)
 AC_SUBST(APTGET)
 AC_DEFINE_UNQUOTED(APTGET, "$APTGET", [Location of apt-get program])
 
+dnl I want gcc to tell me as much as possible
+extra_warnings=""
+#extra_warnings="-W -Wsystem-headers -Wfloat-equal -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Wstrict-prototypes -Wmissing-prototypes -Wmissing-noreturn -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wpacked -Wpadded -Wredundant-decls -Wunreachable-code -Winline -Wlong-long -Wdisabled-optimization"
+dnl -Waggregate-return 
+CXXFLAGS="$CXXFLAGS -Wall $extra_warnings -O0"
+dnl -Werror
+
 AC_CONFIG_FILES([
 Makefile
+debtags/Makefile
 src/Makefile
+tests/Makefile
+swig/Makefile
+swig/python/Makefile
 examples/Makefile
+doc/Makefile
+libdebtags1.pc
 ])
 AC_OUTPUT

Modified: branches/bigmerge/debtags/debian/libdebtags.copyright
==============================================================================
--- branches/bigmerge/debtags/debian/libdebtags.copyright	(original)
+++ branches/bigmerge/debtags/debian/libdebtags.copyright	Fri Aug  5 15:11:56 2005
@@ -3,7 +3,7 @@
 
 Upstream Author: Enrico Zini <enrico at debian.org>
 
-Copyright (C) 2004 Enrico Zini <enrico at debian.org>
+Copyright (C) 2004,2005 Enrico Zini <enrico at debian.org>
 
 License: