Alexandre Julliard : configure: Check for mpg123_feed function since we require it.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7bf8d057d35bfebc84fcc77ffd400cea62ac66d9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7bf8d057d35bfebc84fcc77ffd...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Aug 29 12:20:25 2009 +0200

configure: Check for mpg123_feed function since we require it.

---

 configure    |   24 ++++++++++++------------
 configure.ac |    4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index bcf67cf..fa67fcb 100755
--- a/configure
+++ b/configure
@@ -11273,9 +11273,9 @@ fi
 
 if test "$ac_cv_header_mpg123_h" = "yes"
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_init in -lmpg123" >&5
-$as_echo_n "checking for mpg123_init in -lmpg123... " >&6; }
-if test "${ac_cv_lib_mpg123_mpg123_init+set}" = set; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in -lmpg123" >&5
+$as_echo_n "checking for mpg123_feed in -lmpg123... " >&6; }
+if test "${ac_cv_lib_mpg123_mpg123_feed+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11289,27 +11289,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char mpg123_init ();
+char mpg123_feed ();
 int
 main ()
 {
-return mpg123_init ();
+return mpg123_feed ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mpg123_mpg123_init=yes
+  ac_cv_lib_mpg123_mpg123_feed=yes
 else
-  ac_cv_lib_mpg123_mpg123_init=no
+  ac_cv_lib_mpg123_mpg123_feed=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_init" >&5
-$as_echo "$ac_cv_lib_mpg123_mpg123_init" >&6; }
-if test "x$ac_cv_lib_mpg123_mpg123_init" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_feed" >&5
+$as_echo "$ac_cv_lib_mpg123_mpg123_feed" >&6; }
+if test "x$ac_cv_lib_mpg123_mpg123_feed" = x""yes; then :
   LIBMPG123="-lmpg123"
 
 fi
@@ -11317,9 +11317,9 @@ fi
 fi
 if test "x$ac_cv_lib_mpg123_mpg123_init" != xyes; then :
   case "x$with_mpg123" in
-  x)   wine_notices="$wine_notices|libmpg123 ${notice_platform}development files not found, mp3 codec won't be supported." ;;
+  x)   wine_notices="$wine_notices|libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported." ;;
   xno) ;;
-  *)   as_fn_error "libmpg123 ${notice_platform}development files not found, mp3 codec won't be supported.
+  *)   as_fn_error "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.
 This is an error since --with-mpg123 was requested." "$LINENO" 5 ;;
 esac
 fi
diff --git a/configure.ac b/configure.ac
index c880ad3..1925035 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1411,10 +1411,10 @@ WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"],
 dnl **** Check for mpg123 ****
 if test "$ac_cv_header_mpg123_h" = "yes"
 then
-    AC_CHECK_LIB(mpg123,mpg123_init,[AC_SUBST(LIBMPG123,"-lmpg123")])
+    AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")])
 fi
 WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_init" != xyes],
-                 [libmpg123 ${notice_platform}development files not found, mp3 codec won't be supported.])
+                 [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.])
 test "x$ac_cv_lib_mpg123_mpg123_init" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no}
 
 dnl **** Check for libkstat ****