2 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 3c2e618..59414db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,9 @@ include_HEADERS = popt.h
 
 usrlibdir = $(libdir)@MARK64@
 usrlib_LTLIBRARIES = libpopt.la
+
 libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+libpopt_la_LDFLAGS = @INTLLIBS@
 
 man_MANS = popt.3
 
diff --git a/autogen.sh b/autogen.sh
index 0ccf997..c4a69a8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,8 +5,18 @@ test -z "$srcdir" && srcdir=.
 
 THEDIR="`pwd`"
 
+libtoolize=`which glibtoolize`
+case $libtoolize in
+/*) ;;
+*)  libtoolize=`which libtoolize`
+    case $libtoolize in
+    /*) ;;
+    *)  libtoolize=libtoolize
+    esac
+esac
+
 cd "$srcdir"
-libtoolize --copy --force
+$libtoolize --copy --force
 aclocal
 autoheader
 automake -a -c