[sword-cvs] sword configure.ac,1.41,1.42 Makefile.am,1.45,1.46

[sword at www.crosswire.org]

Update of /cvs/core/sword
In directory www:/tmp/cvs-serv7424

Modified Files:
	configure.ac Makefile.am 
Log Message:

dglassey: disable the splitlib option for now - vk2 works just find alongside vk


Index: configure.ac
===================================================================
RCS file: /cvs/core/sword/configure.ac,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- configure.ac	21 Apr 2004 16:39:53 -0000	1.41
+++ configure.ac	7 May 2004 17:49:44 -0000	1.42
@@ -60,8 +60,8 @@
 	AC_HELP_STRING([--enable-examples],[build examples (default=no)]),,enable_examples=no)
 AC_ARG_ENABLE(versekey2,
 	AC_HELP_STRING([--enable-versekey2],[build with experimental versekey (default=no)]),,enable_versekey2=no)
-AC_ARG_ENABLE(splitlib,
-	AC_HELP_STRING([--enable-splitlib],[split lib into core and import/export legacy part and flatapi (default=no)]),,enable_splitlib=no)
+#AC_ARG_ENABLE(splitlib,
+#	AC_HELP_STRING([--enable-splitlib],[split lib into core and import/export legacy part and flatapi (default=no)]),,enable_splitlib=no)
 AC_ARG_ENABLE(refsys,
 	AC_HELP_STRING([--enable-refsys],[build alternative versification data files - requires expat (default=no)]),,enable_refsys=no)
 AM_MAINTAINER_MODE
@@ -204,14 +204,14 @@
 	])
 fi
 
-if test x$enable_splitlib = xyes; then
-  enable_versekey2=no
-fi
+#if test x$enable_splitlib = xyes; then
+#  enable_versekey2=no
+#fi
 
-if test x$enable_versekey2 = xyes; then
-  AM_CFLAGS="$AM_CFLAGS -DVK2"
-  AM_CXXFLAGS="$AM_CXXFLAGS -DVK2"
-fi
+#if test x$enable_versekey2 = xyes; then
+#  AM_CFLAGS="$AM_CFLAGS -DVK2"
+#  AM_CXXFLAGS="$AM_CXXFLAGS -DVK2"
+#fi
 
 
 # ---------------------------------------------------------------------
@@ -311,7 +311,7 @@
 AM_CONDITIONAL(BUILDUTILS, test x$enable_utilities = xyes)
 AM_CONDITIONAL(BUILDEXAMPLES, test x$enable_examples = xyes)
 AM_CONDITIONAL(BUILDNEWVKEY, test x$enable_versekey2 = xyes)
-AM_CONDITIONAL(BUILDSPLITLIB, test x$enable_splitlib = xyes)
+#AM_CONDITIONAL(BUILDSPLITLIB, test x$enable_splitlib = xyes)
 AM_CONDITIONAL(BUILDREFSYS, test x$enable_refsys = xyes)
 
 # ---------------------------------------------------------------------

Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile.am	21 Apr 2004 07:06:39 -0000	1.45
+++ Makefile.am	7 May 2004 17:49:45 -0000	1.46
@@ -103,12 +103,12 @@
 endif
 
 #testlib_LDADD = -L./lib -lsword -lsword_imp $(iculibs)
-if BUILDSPLITLIB
-testlib_LDADD = $(top_builddir)/lib/libsword_imp.la \
-	$(top_builddir)/lib/libsword.la
-else
+#if BUILDSPLITLIB
+#testlib_LDADD = $(top_builddir)/lib/libsword_imp.la \
+#	$(top_builddir)/lib/libsword.la
+#else
 testlib_LDADD = $(top_builddir)/lib/libsword.la
-endif
+#endif
 
 include locales.d/Makefile.am
 include samples/Makefile.am