3 files changed, 90 insertions, 0 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 7d45bdcd2..2ed1fb453 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -15,9 +15,11 @@ EXTRA_DIST = \
 	as.m4 \
 	caca.m4 \
 	codeset.m4 \
+	dl.m4 \
 	dvdnav.m4 \
 	esd.m4 \
 	ffmpeg.m4 \
+	freetype2.m4 \
 	gettext.m4 \
 	glibc21.m4 \
 	iconv.m4 \
diff --git a/m4/dl.m4 b/m4/dl.m4
new file mode 100644
index 000000000..ff3fc71d5
--- /dev/null
+++ b/m4/dl.m4
@@ -0,0 +1,54 @@
+dnl
+dnl Check for dlopen symbol and set DYNAMIC_LD_LIBS.
+dnl
+dnl AM_DL()
+dnl
+
+AC_DEFUN([AM_DL], [
+  AC_CHECK_LIB(c, dlopen,
+   [DYNAMIC_LD_LIBS=""
+    have_dl=yes])
+
+  if test x$have_dl != "xyes"; then
+    AC_CHECK_LIB(dl, dlopen,
+     [DYNAMIC_LD_LIBS="-ldl"
+      have_dl=yes])
+  fi
+
+  if test x$have_dl != "xyes"; then
+    AC_MSG_CHECKING(for dlopen under win32)
+    AC_LANG_SAVE()
+    AC_LANG_C()
+
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    ac_save_LIBS="$LIBS"
+    CPPFLAGS="-I${srcdir}/win32/include $CPPFLAGS"
+    LIBS="$LIBS -lkernel32"
+    AC_COMPILE_IFELSE([
+#include <stddef.h>
+#include <dlfcn.h>
+
+int main() {
+  dlopen(NULL, 0);
+  return 0;
+}
+], 
+      [DYNAMIC_LD_LIBS=-lkernel32
+       have_dl=yes
+       AC_MSG_RESULT(yes)],
+       AC_MSG_RESULT(no)
+    )
+
+    CPPFLAGS=$ac_save_CPPFLAGS
+    LIBS=$ac_save_LIBS
+
+    AC_LANG_RESTORE()
+  fi
+
+  if test x$have_dl != "xyes"; then
+    AC_MSG_ERROR(dynamic linker needed)
+  fi
+
+  AC_SUBST(DYNAMIC_LD_LIBS)
+
+])
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
new file mode 100644
index 000000000..d894b5fb4
--- /dev/null
+++ b/m4/freetype2.m4
@@ -0,0 +1,34 @@
+dnl
+dnl Search the freetype library.
+dnl
+dnl AM_PATH_FREETYPE2()
+dnl
+
+AC_DEFUN([AM_PATH_FREETYPE2], [
+
+  AC_ARG_ENABLE(freetype,
+    AC_HELP_STRING([--disable-freetype], [disable freetype2 support]),
+    [enable_freetype=$enableval],
+    [enable_freetype=yes]
+  )
+
+  if test x"$enable_freetype" = "xyes"; then
+    AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+    if test "$FREETYPE_CONFIG" = "no" ; then
+      AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled **
+  ])
+    else
+      FT2_CFLAGS=`$FREETYPE_CONFIG --cflags`
+      FT2_LIBS=`$FREETYPE_CONFIG --libs`
+      have_ft2="yes"
+      AC_DEFINE(HAVE_FT2,1,[Define this if you have freetype2 library])
+    fi
+  else
+    AC_MSG_RESULT([*** freetype2 support disabled ***])
+  fi
+
+  dnl AM_CONDITIONAL(HAVE_FT2, test x"$have_ft2" = "xyes" )
+  AC_SUBST(FT2_CFLAGS)
+  AC_SUBST(FT2_LIBS)
+
+])