getting closer to building swig stuff

diff --git a/Makefile.am b/Makefile.am
index b2edb4d4475d1d40f6271346e89984e4695a6389..2d661ce6e9a958532aa293afc62479bc5a5396c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
 AUTOMAKE_OPTIONS = gnu
-EXTRA_DIST = web autogen.sh
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = m4 web autogen.sh
 SUBDIRS = src
\ No newline at end of file

diff --git a/autogen.sh b/autogen.sh
index c5d47c5e8b5334c4d482d7f29626e046cb4ff023..669a365acdff2def5965434e59c3cc97bcdcdf1d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 rm -f config.cache
-aclocal
+libtoolize --force --copy
+aclocal -I m4
 autoconf
 autoheader
 automake -a --add-missing

diff --git a/configure.ac b/configure.ac
index 5245351f64426556eaa19b4ab1c89a7153bdedc5..ac0028b57b1a5f738acc3739fac445238cf0119c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,14 @@ AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
 
+# swig
+#AM_PROG_CC_C_O
+#AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AX_WITH_PERL
+AC_PROG_SWIG
+SWIG_ENABLE_CXX
+
 
 # Checks for libraries.
 AC_CHECK_LIB([m], [pow])

diff --git a/src/Makefile.am b/src/Makefile.am
index 39e2ce70ab2fb3ce3d001b41e862bce9f03611c5..60b882057841a572cf673a0de608b9c6cfbff116 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,6 +58,25 @@ fakesyn_LDADD = libmon.a libmds.a libosd.a libebofs.a \
 streamtest_SOURCES = streamtest.cc
 streamtest_LDADD = libosd.a libebofs.a libcommon.a
 
+# crushwrapper
+lib_LTLIBRARIES = libcrushwrapper.la
+libcrushwrapper_la_SOURCES = crush/CrushWrapper.h config.cc crush/mapper.c crush/builder.c crush/crush.c
+libcrushwrapper_la_CFLAGS = ${AM_CFLAGS}
+libcrushwrapper_la_CXXFLAGS = ${AM_CXXFLAGS}
+
+BUILT_SOURCES = crush/CrushWrapper_wrap.cxx
+
+SWIG_FILES = crush/CrushWrapper.i crush/CrushWrapper.h
+crush/CrushWrapper_wrap.cxx: ${SWIG_FILES}
+       ${SWIG} -perl5 -c++ -shadow $<
+
+#crushtool_PERL = crushtool.pl
+_crushwrapper_la_SOURCES = crush/CrushWrapper_wrap.cxx ${SWIG_FILES}
+_crushwrapper_la_CPPFLAGS = ${SWIG_PERL_CPPFLAGS} -I/usr/lib/perl/5.8/CORE -dno-strict-aliasing -pipe
+_crushwrapper_la_LDFLAGS = -module
+#_crushwrapper_la_LIBADD = lib
+
+
 ##
 INCLUDES = 
 LDADD = -lpthread 
@@ -77,6 +96,8 @@ noinst_LIBRARIES = \
        libcommon.a libcrush.a \
        libmon.a libmds.a libosdc.a libosd.a libebofs.a libclient.a
 
+noinst_LTLIBRARIES = _crushwrapper.la
+
 # extra bits
 EXTRA_DIST = start.sh stop.sh