[gimp-gap] fixed bulid issuses #582241 and #582216

[Wolfgang Hofer <wolfgangh src gnome org>]

commit c36ac7a2e5643e3d7e53e044a54422450ccabc97
Author: Wolfgang Hofer <wolfgangh svn gnome org>
Date:   Tue May 12 20:21:44 2009 +0200

    fixed bulid issuses #582241 and #582216
---
 ChangeLog                |   14 ++++++++++++++
 configure.in             |    9 ++++-----
 libgapvidapi/Makefile.am |    2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfdb16c..dab8128 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-05-12 Wolfgang Hofer <hof gimp org>
+
+- applied patch from David Evans #582241 to make sure to include
+  ffmpeg header files of the the local embedded copy of ffmpeg
+  even if another copy of ffmpeg is installed in system include paths.
+
+- fixed confusing configure warnings (reported in #582216)
+  unrecognized options: --disable-audio-support, --enable-gdkpixbuf-pview
+
+- use autool typical AC_CHECK_PROG to check gmake program 
+
+  * configure.in
+  * libgapvidapi/Makefile.am
+  
 2009-05-10 Wolfgang Hofer <hof gimp org>
 
 configure and build issues to fix Mac specific bugs reported by David Evans.
diff --git a/configure.in b/configure.in
index 7b6779c..b765439 100644
--- a/configure.in
+++ b/configure.in
@@ -76,9 +76,8 @@ AC_MSG_RESULT([$target_or_host])
 
 dnl check if gmake is available
 EXGMAKE=make
-type gmake
-rc_gmake_check=$?
-if test $rc_gmake_check = 0; then
+AC_CHECK_PROG(GMAKE_AVAILABLE, gmake, yes, no)
+if test $GMAKE_AVAILABLE = yes; then
   EXGMAKE=gmake
 fi
 AC_SUBST(EXGMAKE)
@@ -948,7 +947,7 @@ dnl Test for audiosupport
 dnl audiosupport currently is based on wavplay that is available on UNIX systems
 dnl (the wavplay client does not compile on Windows)
 dnl ------------------------
-AC_ARG_ENABLE(audiosupport,
+AC_ARG_ENABLE(audio_support,
               [  --disable-audio-support      don't build with audio support])
   if test "x$os_win32" = "xyes"; then
      enable_audio_support=no
@@ -972,7 +971,7 @@ AM_CONDITIONAL(GAP_AUDIO_SUPPORT, test "x$enable_audio_support" != "xno")
 
 dnl optional compile preview widget with GDK-pixbuf support
 dnl 
-AC_ARG_ENABLE(gdkpixbuf,
+AC_ARG_ENABLE(gdkpixbuf_pview,
               [  --enable-gdkpixbuf-pview     use GdkPixbuf thumbnail rendering (default=no)])
   if test "x$enable_gdkpixbuf_pview" = "xyes"; then
     AC_DEFINE(GAP_PVIEW_USE_GDK_PIXBUF_RENDERING, 1,
diff --git a/libgapvidapi/Makefile.am b/libgapvidapi/Makefile.am
index b47b7ff..9b62368 100644
--- a/libgapvidapi/Makefile.am
+++ b/libgapvidapi/Makefile.am
@@ -12,9 +12,9 @@ INC_LIBGAPBASE = -I$(top_srcdir)/libgapbase
 
 INCLUDES = \
 	-I$(top_srcdir)	\
+	$(GAPVIDEOAPI_EXTINCS)	\
 	$(GLIB_CFLAGS)	\
 	$(GIMP_CFLAGS)	\
-	$(GAPVIDEOAPI_EXTINCS)	\
 	$(INC_LIBGAPBASE)	\
 	-I$(includedir)