Make bootstrap work on different platforms. Get it compiling from

make dist generated tarball.

5 files changed, 20 insertions, 3 deletions

diff --git a/.cvsignore b/.cvsignore
index a748cd5b..2f1b4bf1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,3 +11,4 @@ depcomp
 install-sh
 libtool
 missing
+m4
diff --git a/Makefile.am b/Makefile.am
index 1a52f66e..3ea0a950 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = usrsctplib programs
 EXTRA_DIST = bootstrap
+ACLOCAL_AMFLAGS = -I m4
diff --git a/bootstrap b/bootstrap
index ee5236b1..ae4753eb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,19 @@
 #! /bin/sh
-set -x
-aclocal
-glibtoolize
+if [ -e /usr/bin/glibtoolize ] ; then
+    glibtoolize --force
+elif [ -e /usr/bin/libtoolize ] ; then
+    libtoolize --force
+elif [ -e /usr/local/bin/libtoolize ] ; then
+    libtoolize --force
+else
+   echo "ERROR: I cannot find libtoolize or glibtoolize!"
+   exit 1
+fi
+
+if [ -e /usr/local/share/aclocal ] ; then
+   aclocal -I /usr/local/share/aclocal
+else
+   aclocal -I /usr/share/aclocal
+fi
 autoconf
 automake --foreign --add-missing --copy
diff --git a/configure.in b/configure.in
index 3d0844cd..5d729df2 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ AM_INIT_AUTOMAKE(libusrsctp, 0.1)
 AC_PROG_CC
 AC_PROG_LIBTOOL
 AC_CANONICAL_HOST
+AC_CONFIG_MACRO_DIR([m4])
 
 CFLAGS="$CFLAGS -g -O0 -DUSE_SCTP_SHA1 -D__Userspace__ -DSCTP_SIMPLE_ALLOCATOR"
 
diff --git a/usrsctplib/Makefile.am b/usrsctplib/Makefile.am
index 5e3959a1..38cb8c74 100644
--- a/usrsctplib/Makefile.am
+++ b/usrsctplib/Makefile.am
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES        = libusrsctp.la
 libusrsctp_la_SOURCES  = opt_compat.h \
+                         opt_inet.h \
                          opt_inet6.h \
                          opt_ipsec.h \
                          opt_sctp.h \