Author: rooneg
Date: Wed Mar 30 16:31:21 2005
New Revision: 159549
URL: http://svn.apache.org/viewcvs?view=rev&rev=159549
Log:
Build system updates. This makes Lucene4c use the libtool installed
by APR, builds a dynamic library instead of a static one, fixes up the
install procedure to install just the lcn tool, headers, and library,
and refactors the bootstrap script a bit.
* configure.in: update to build dynamic libs using APR's libtool.
* Makefile.am: update for dynamic library build and install.
* bootstrap: refactor to better support detection of proper autoconf,
automake, etc.
* test,
config,
src/query_parser,
src/search,
src/index,
src/cmdline,
src/store,
src/util,
src/document: update svn:ignore properties.
Submitted By: Paul Querna
Modified:
incubator/lucene4c/trunk/ (props changed)
incubator/lucene4c/trunk/Makefile.am
incubator/lucene4c/trunk/bootstrap
incubator/lucene4c/trunk/config/ (props changed)
incubator/lucene4c/trunk/configure.in
incubator/lucene4c/trunk/src/cmdline/ (props changed)
incubator/lucene4c/trunk/src/document/ (props changed)
incubator/lucene4c/trunk/src/index/ (props changed)
incubator/lucene4c/trunk/src/query_parser/ (props changed)
incubator/lucene4c/trunk/src/search/ (props changed)
incubator/lucene4c/trunk/src/store/ (props changed)
incubator/lucene4c/trunk/src/util/ (props changed)
incubator/lucene4c/trunk/test/ (props changed)
Propchange: incubator/lucene4c/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -7,4 +7,5 @@
config.status
configure
.deps
-liblucene4c.a
+liblucene4c.la
+.libs
Modified: incubator/lucene4c/trunk/Makefile.am
URL:
http://svn.apache.org/viewcvs/incubator/lucene4c/trunk/Makefile.am?view=diff&r1=159548&r2=159549
==============================================================================
--- incubator/lucene4c/trunk/Makefile.am (original)
+++ incubator/lucene4c/trunk/Makefile.am Wed Mar 30 16:31:21 2005
@@ -13,29 +13,30 @@
config/missing \
config/mkinstalldirs
-lib_LIBRARIES = liblucene4c.a
+lib_LTLIBRARIES = liblucene4c.la
-liblucene4c_a_SOURCES = src/util/error.c \
- src/util/string.c \
- src/util/pools.c \
- src/store/istream.c \
- src/store/directory.c \
- src/search/query.c \
- src/search/scorer.c \
- src/query_parser/parser.c \
- src/index/index.c \
- src/index/segments.c \
- src/index/segment.c \
- src/index/term.c \
- src/index/terminfos.c \
- src/index/frequencies.c \
- src/index/fielddata.c \
- src/index/fieldinfos.c \
- src/document/document.c \
- src/document/field.c
+liblucene4c_la_SOURCES = src/util/error.c \
+ src/util/string.c \
+ src/util/pools.c \
+ src/store/istream.c \
+ src/store/directory.c \
+ src/search/query.c \
+ src/search/scorer.c \
+ src/query_parser/parser.c \
+ src/index/index.c \
+ src/index/segments.c \
+ src/index/segment.c \
+ src/index/term.c \
+ src/index/terminfos.c \
+ src/index/frequencies.c \
+ src/index/fielddata.c \
+ src/index/fieldinfos.c \
+ src/document/document.c \
+ src/document/field.c
-bin_PROGRAMS = test/tests \
- src/cmdline/lcn
+noinst_PROGRAMS = test/tests
+
+bin_PROGRAMS = src/cmdline/lcn
test_tests_SOURCES = test/abts.c \
test/lcn_tests.c \
@@ -54,9 +55,29 @@
src_cmdline_lcn_SOURCES = src/cmdline/main.c
-src_cmdline_lcn_LDADD= liblucene4c.a
+src_cmdline_lcn_LDADD= liblucene4c.la
+
+test_tests_LDADD = liblucene4c.la
+
+inst_includesdir = $(includedir)/lucene4c-0
-test_tests_LDADD = liblucene4c.a
+inst_includes_HEADERS = include/lcn_api.h \
+ include/lcn_directory.h \
+ include/lcn_document.h \
+ include/lcn_field.h \
+ include/lcn_fielddata.h \
+ include/lcn_fieldinfos.h \
+ include/lcn_frequencies.h \
+ include/lcn_index.h \
+ include/lcn_istream.h \
+ include/lcn_query.h \
+ include/lcn_query_parser.h \
+ include/lcn_scorer.h \
+ include/lcn_segment.h \
+ include/lcn_segments.h \
+ include/lcn_terminfos.h \
+ include/lcn_term.h \
+ include/lcn_types.h
INCLUDES = -Iinclude -Itest $(LCN_APR_INCLUDES)
Modified: incubator/lucene4c/trunk/bootstrap
URL:
http://svn.apache.org/viewcvs/incubator/lucene4c/trunk/bootstrap?view=diff&r1=159548&r2=159549
==============================================================================
--- incubator/lucene4c/trunk/bootstrap (original)
+++ incubator/lucene4c/trunk/bootstrap Wed Mar 30 16:31:21 2005
@@ -1,12 +1,18 @@
#!/bin/sh
+
+LIBTOOLIZE=libtoolize
+ACLOCAL=aclocal
+AUTOMAKE=automake
+AUTOCONF=autoconf
+
if [ -e /etc/debian_version ]; then
- aclocal-1.6 -I config
- automake-1.6 --foreign --add-missing --copy
- autoconf
-else
- aclocal -I config
- automake --foreign --add-missing --copy
- autoconf
+ ACLOCAL=aclocal-1.9
+ AUTOMAKE=automake-1.9
fi
+
+$LIBTOOLIZE --force --copy
+$ACLOCAL -I config
+$AUTOMAKE --foreign --add-missing --copy
+$AUTOCONF
rm -rf autom4te.cache
Propchange: incubator/lucene4c/trunk/config/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -5,3 +5,4 @@
install-sh
config.guess
config.sub
+ltmain.sh
Modified: incubator/lucene4c/trunk/configure.in
URL:
http://svn.apache.org/viewcvs/incubator/lucene4c/trunk/configure.in?view=diff&r1=159548&r2=159549
==============================================================================
--- incubator/lucene4c/trunk/configure.in (original)
+++ incubator/lucene4c/trunk/configure.in Wed Mar 30 16:31:21 2005
@@ -1,10 +1,10 @@
-AC_INIT(src/store/istream.c)
+AC_INIT(lucene4c, 0.04)
+AC_CONFIG_SRCDIR([src/store/istream.c])
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(lucene4c, 0.01)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AC_PROG_CC
AM_PROG_CC_C_O
-AC_PROG_RANLIB
AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
@@ -21,6 +21,9 @@
LCN_APR_LIBS="$LIBS `$apr_config --link-ld --libs`"
LCN_APR_INCLUDES="`$apr_config --includes`"
+
+LIBTOOL="`$apr_config --apr-libtool`"
+AC_SUBST(LIBTOOL)
AC_ARG_ENABLE(maintainer-mode,
AC_HELP_STRING([--enable-maintainer-mode],
Propchange: incubator/lucene4c/trunk/src/cmdline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,3 +1,4 @@
lcn
.deps
.dirstamp
+.libs
Propchange: incubator/lucene4c/trunk/src/document/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,2 +1,3 @@
.deps
.dirstamp
+.libs
Propchange: incubator/lucene4c/trunk/src/index/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,2 +1,3 @@
.deps
.dirstamp
+.libs
Propchange: incubator/lucene4c/trunk/src/query_parser/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,2 +1,3 @@
.dirstamp
.deps
+.libs
Propchange: incubator/lucene4c/trunk/src/search/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,2 +1,3 @@
.deps
.dirstamp
+.libs
Propchange: incubator/lucene4c/trunk/src/store/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,2 +1,3 @@
.deps
.dirstamp
+.libs
Propchange: incubator/lucene4c/trunk/src/util/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,2 +1,3 @@
.deps
.dirstamp
+.libs
Propchange: incubator/lucene4c/trunk/test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 30 16:31:21 2005
@@ -1,3 +1,4 @@
tests
.deps
.dirstamp
+.libs
