Build with libtool.

We link against glib, which is built using libtool, so using libtool
ourselves gives better results "out of the box".  For example, if glib
is installed to a non-standard location libtool will automatically add
appropriate rpath options when linking.

diff --git a/.gitignore b/.gitignore
index 6535b8f537f7367322bd2ce4b0619d88ba8a4200..d476b8f7085d0dadb85b7ff6e4dfef74bd90e791 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@
 /gob2
 /gob2.spec
 /install-sh
+/libtool
+/ltmain.sh
 /missing
 /stamp-h1
 /ylwrap

diff --git a/Makefile.am b/Makefile.am
index 41ac9d8cbaa6737cf57809e754dddddf1f726e73..83d7b31c2111ed4adb3d96624437b85fc8157137 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,8 @@
 # This is free software: you are free to change and redistribute it.
 # There is NO WARRANTY, to the extent permitted by law.
 
+ACLOCAL_AMFLAGS = -I m4
+
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
               -I$(builddir) -I$(srcdir) -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_CFLAGS = $(GLIB_CFLAGS)

diff --git a/configure.ac b/configure.ac
index 8e7a1f0a7884fd1314cbffb8b74941af1bcd1fb4..f78cf395d4086217fb9a7eed88feb700bed25c52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,8 @@ AC_ARG_VAR([PERL], [command to execute perl programs])
 AC_CHECK_PROGS([PERL], [perl], [false])
 AM_CONDITIONAL([HAVE_PERL], [$PERL -e 'my $x = 42; exit $x'; test $? = 42])
 
+LT_INIT
+
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4.0])
 
 AC_CONFIG_FILES([Makefile gob2.spec doc/gob2.1])

diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644 (file)
index 0000000..38066dd
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4