From 6a4addab8bde2d0f78340591c643c8156c4dc490 Mon Sep 17 00:00:00 2001
From: Tony Houghton <h@realh.co.uk>
Date: Mon, 3 Sep 2007 18:23:19 +0100
Subject: [PATCH] Use libtool for linking to make sure we can auto-connect
 handlers with glade.

---
 ROX-Filer/src/Makefile.in  | 5 +++--
 ROX-Filer/src/configure.in | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ROX-Filer/src/Makefile.in b/ROX-Filer/src/Makefile.in
index 4a292853..17b17fc9 100644
--- a/ROX-Filer/src/Makefile.in
+++ b/ROX-Filer/src/Makefile.in
@@ -7,6 +7,7 @@ CC = @CC@
 .SUFFIXES: .c .o
 
 PKG_CONFIG = @PKG_CONFIG@
+LIBTOOL = @LIBTOOL@
 LIBS = @LIBS@ @LFS_LDFLAGS@ -lICE -lSM
 #PROF = -fprofile-arcs -pg
 
@@ -14,7 +15,7 @@ PKG_CONFIG_FLAGS=
 
 CFLAGS = -I. -I${srcdir} ${PROF} @CFLAGS@ @LFS_CFLAGS@ \
 	 `${PKG_CONFIG} ${PKG_CONFIG_FLAGS} --cflags gtk+-2.0 libxml-2.0 libglade-2.0`
-LDFLAGS = ${PROF} @LDFLAGS@ `${PKG_CONFIG} ${PKG_CONFIG_FLAGS} --libs gtk+-2.0 libxml-2.0 libglade-2.0 | sed 's/-lpangoxft-[^ ]*//'` ${LIBS}
+LDFLAGS = ${PROF} @LDFLAGS@ -export-dynamic `${PKG_CONFIG} ${PKG_CONFIG_FLAGS} --libs gtk+-2.0 libxml-2.0 libglade-2.0 | sed 's/-lpangoxft-[^ ]*//'` ${LIBS}
 
 ############ Things to change for different programs
 
@@ -45,7 +46,7 @@ OBJECTS = abox.o action.o appinfo.o appmenu.o bind.o bookmarks.o	\
 ############ Things to keep the same
 
 ${PROG}: ${OBJECTS}
-	${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
+	$(LIBTOOL) --mode=link ${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
 	mv "${PROG}" "${PLATFORM_DIR}"
 	-(cd "${PLATFORM_DIR}" && \
 	 objcopy --only-keep-debug ROX-Filer ROX-Filer.dbg && \
diff --git a/ROX-Filer/src/configure.in b/ROX-Filer/src/configure.in
index 539ddc82..0ba0f8c4 100644
--- a/ROX-Filer/src/configure.in
+++ b/ROX-Filer/src/configure.in
@@ -45,6 +45,13 @@ pkg-config comes with the developement packages for GTK+-2.4, available at:
     http://www.gtk.org])
 fi
 
+AC_PATH_PROG(LIBTOOL, libtool)
+if test -z "$LIBTOOL"
+then
+	AC_MSG_ERROR([*** libtool missing ***])
+fi
+AC_SUBST(LIBTOOL)
+
 AC_DEFUN(ROX_REQUIRE, [
 AC_MSG_CHECKING(that $1 (version >= $2) is installed)
 if "$PKG_CONFIG" --atleast-version=$2 $1 ; then
-- 
2.11.4.GIT