2 files changed, 10 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index ba84850a..bd556500 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
-for pkg in pkg-config libtool automake aclocal autoreconf:autoconf autopoint:gettext
+if [ `uname` == Darwin ]; then
+	LIBTOOL=glibtool
+else
+	LIBTOOL=libtool
+fi
+
+for pkg in pkg-config $LIBTOOL automake aclocal autoreconf:autoconf autopoint:gettext
 do
 	if ! ${pkg%%:*} --version >/dev/null 
 	then
diff --git a/configure.in b/configure.in
index 5ab88a9f..31579af3 100644
--- a/configure.in
+++ b/configure.in
@@ -62,6 +62,9 @@ m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CC
+if eval "test x`uname` = xDarwin"; then
+	CFLAGS="$CFLAGS -I/opt/local/include -L/opt/local/lib"
+fi
 if eval "test x$GCC = xyes"; then
         CFLAGS="$CFLAGS -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type -D_GNU_SOURCE"
 fi