* GNU make detection

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 3d311cb65c32ba30790cb64e4e3b788eb8fab20b..a17e8a63ceb193fbee6145b15d9da031e08466a8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,23 @@ AC_PROG_CPP
 dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
+dnl Check for GNU make
+AC_PATH_PROG(GMAKE, gmake, no)
+if test "x$GMAKE" = "xno"; then
+  AC_CACHE_CHECK([whether GNU make is installed],
+      [ac_cv_gmake],
+      [if make --version | grep -q -i gnu; then
+         ac_cv_gmake="yes"
+       else
+         echo "This software needs you to install GNU make to compile properly."
+         echo "You can get it from http://www.gnu.org/."
+         exit
+       fi])
+  VLC_MAKE="make"
+else
+  VLC_MAKE="gmake"
+fi
+
 dnl Gettext stuff
 ALL_LINGUAS="de fr no ru"
 
@@ -1532,7 +1549,8 @@ AC_ARG_ENABLE(plugins,
    fi])
 
 dnl Automagically disable plug-ins if there is no system support for .so files
-if test x$ac_cv_header_dlfcn_h = xno -a x$ac_cv_header_image_h = xno
+dnl don't forget vlc-win32 still can load .so as plugins
+if test x$ac_cv_header_dlfcn_h = xno -a x$ac_cv_header_image_h = xno -a x$SYS != xmingw32
 then
   echo "*** Your system doesn't have plug-in support. All plug-ins will be compiled"
   echo "as built-in"
@@ -1701,11 +1719,11 @@ which modules get compiled as plugins.
 "
 if test x${HAVE_VLC} = x1
 then
-  echo "To build vlc and its plugins, type \`make'."
+  echo "To build vlc and its plugins, type \`$VLC_MAKE'."
 fi
 if test x${NEED_LIBDVDCSS} = x1
 then
-  echo "To build libdvdcss only, type \`make libdvdcss'."
+  echo "To build libdvdcss only, type \`$VLC_MAKE libdvdcss'."
 fi
 echo ""