From 7c1e287c7126c60d8d6f0bd8e22d4f8b647c3fa9 Mon Sep 17 00:00:00 2001
From: jfouet <jfouet@1f5c12ca-751b-0410-a591-d2e778427230>
Date: Wed, 24 Feb 2010 09:27:18 +0000
Subject: [PATCH] Add configure options to link dynamically with libmoses

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@2932 1f5c12ca-751b-0410-a591-d2e778427230
---
 Makefile.am               |  2 ++
 config.h.in               |  7 +++++++
 configure.in              |  6 ++++--
 misc/Makefile.am          |  9 +++------
 moses-cmd/src/Makefile.am | 19 ++++++++-----------
 moses/src/Makefile.am     | 14 +++++++-------
 regenerate-makefiles.sh   |  8 ++++++++
 7 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 90b069c79..fbb9deec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign
 
+ACLOCAL_AMFLAGS = -I m4
+
 # order is important here: build moses before moses-cmd
 if WITH_MERT
     MERT = mert
diff --git a/config.h.in b/config.h.in
index 73662496e..53a16d1b0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,6 +6,9 @@
 /* define if the Boost::Thread library is available */
 #undef HAVE_BOOST_THREAD
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
@@ -48,6 +51,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/configure.in b/configure.in
index 014510dda..ed19bc392 100644
--- a/configure.in
+++ b/configure.in
@@ -3,11 +3,13 @@ AC_INIT(moses/src)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(moses, 0.1)
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_LANG_CPLUSPLUS
-AC_PROG_RANLIB
-#AM_PROG_LIBTOOL
+
+AM_PROG_LIBTOOL
 
 AX_XMLRPC_C
 
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 91e5bbf45..d08f0e8c9 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -6,11 +6,8 @@ queryLexicalTable_SOURCES    = queryLexicalTable.cpp
 
 AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -I$(top_srcdir)/moses/src $(BOOST_CPPFLAGS)
 
-processPhraseTable_LDADD = -L$(top_srcdir)/moses/src -lmoses $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
-processPhraseTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a 
+processPhraseTable_LDADD = $(top_builddir)/moses/src/libmoses.la $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
 
-processLexicalTable_LDADD = -L$(top_srcdir)/moses/src -lmoses $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
-processLexicalTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a
+processLexicalTable_LDADD = $(top_builddir)/moses/src/libmoses.la $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
 
-queryLexicalTable_LDADD = -L$(top_srcdir)/moses/src -lmoses $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
-queryLexicalTable_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a
+queryLexicalTable_LDADD = $(top_builddir)/moses/src/libmoses.la $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
diff --git a/moses-cmd/src/Makefile.am b/moses-cmd/src/Makefile.am
index 9418d2b55..ed6d2345a 100644
--- a/moses-cmd/src/Makefile.am
+++ b/moses-cmd/src/Makefile.am
@@ -1,19 +1,16 @@
 if WITH_THREADS
-bin_PROGRAMS = moses mosesmt lmbrgrid
+  bin_PROGRAMS = moses mosesmt lmbrgrid
 else
-bin_PROGRAMS = moses lmbrgrid
+  bin_PROGRAMS = moses lmbrgrid
 endif
+
 AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DUSE_HYPO_POOL -I$(top_srcdir)/moses/src  $(BOOST_CPPFLAGS)
+
 moses_SOURCES = Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp LatticeMBR.cpp
-moses_LDADD = -L$(top_srcdir)/moses/src -lmoses $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
-moses_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a 
-
-mosesmt_SOURCES = MainMT.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp ThreadPool.cpp LatticeMBR.cpp
-mosesmt_LDADD = -L$(top_srcdir)/moses/src $(BOOST_LDFLAGS) -lmoses $(BOOST_THREAD_LIB)
-mosesmt_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a 
+moses_LDADD = $(top_builddir)/moses/src/libmoses.la $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
 
+mosesmt_SOURCES = MainMT.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp ThreadPool.cpp
+mosesmt_LDADD = $(top_builddir)/moses/src/libmoses.la $(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
 
 lmbrgrid_SOURCES = LatticeMBRGrid.cpp LatticeMBR.cpp IOWrapper.cpp
-lmbrgrid_LDADD = -L$(top_srcdir)/moses/src $(BOOST_LDFLAGS) -lmoses $(BOOST_THREAD_LIB)
-lmbrgrid_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a 
-
+lmbrgrid_LDADD = $(top_builddir)/moses/src/libmoses.la $(BOOST_THREAD_LIB)
\ No newline at end of file
diff --git a/moses/src/Makefile.am b/moses/src/Makefile.am
index 0a83dbef4..b40977fe7 100644
--- a/moses/src/Makefile.am
+++ b/moses/src/Makefile.am
@@ -1,6 +1,6 @@
-lib_LIBRARIES = libmoses.a
+lib_LTLIBRARIES = libmoses.la
 AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES $(BOOST_CPPFLAGS)
-libmoses_a_SOURCES = \
+libmoses_la_SOURCES = \
 	BitmapContainer.cpp \
 	ConfusionNet.cpp \
 	DecodeGraph.cpp \
@@ -97,24 +97,24 @@ hypergraph.pb.cc: hypergraph.proto
 hypergraph.pb.h: hypergraph.proto
 	@PROTOC@ --cpp_out=. $<			
 
-libmoses_a_SOURCES += rule.pb.cc hypergraph.pb.cc
+libmoses_la_SOURCES += rule.pb.cc hypergraph.pb.cc
 
 endif
 
 if SRI_LM
-libmoses_a_SOURCES += LanguageModelSRI.cpp
+libmoses_la_SOURCES += LanguageModelSRI.cpp
 endif
 
 if IRST_LM
-libmoses_a_SOURCES += LanguageModelIRST.cpp
+libmoses_la_SOURCES += LanguageModelIRST.cpp
 endif
 
 if RAND_LM
-libmoses_a_SOURCES += LanguageModelRandLM.cpp
+libmoses_la_SOURCES += LanguageModelRandLM.cpp
 endif
 
 if INTERNAL_LM
-libmoses_a_SOURCES += LanguageModelInternal.cpp \
+libmoses_la_SOURCES += LanguageModelInternal.cpp \
 		      NGramCollection.cpp \
 		      NGramNode.cpp
 endif
diff --git a/regenerate-makefiles.sh b/regenerate-makefiles.sh
index 85f97f040..32d88bb55 100755
--- a/regenerate-makefiles.sh
+++ b/regenerate-makefiles.sh
@@ -30,6 +30,11 @@ then
     AUTOCONF=`which autoconf`
 fi
 
+if [ -z "$LIBTOOLIZE" ]
+then
+    LIBTOOLIZE=`which libtoolize`
+fi
+
 
 echo "Calling $ACLOCAL..."
 $ACLOCAL -I m4 || die "aclocal failed"
@@ -37,6 +42,9 @@ echo "Calling $AUTOCONF..."
 $AUTOCONF  || die "autoconf failed"
 echo "Calling $AUTOMAKE..."
 $AUTOMAKE || die "automake failed"
+echo "Calling $LIBTOOLIZE"
+$LIBTOOLIZE || die "libtoolize failed"
+
 
 echo
 echo "You should now be able to configure and build:"