From 9aae769b3708cb261307a84da03e858e3cf4c222 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 31 Mar 2002 03:32:58 +0000 Subject: correct a condition in check-libheader.m4 remove gst a52 and mpeg2dec m4's in favor of ones i have sent to walken for... Original commit message from CVS: * correct a condition in check-libheader.m4 * remove gst a52 and mpeg2dec m4's in favor of ones i have sent to walken for inclusion in the upstream packages --- m4/a52.m4 | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++ m4/check-libheader.m4 | 13 +++--- m4/gst-a52.m4 | 65 --------------------------- m4/gst-mpeg2dec.m4 | 19 -------- m4/mpeg2dec.m4 | 76 +++++++++++++++++++++++++++++++ 5 files changed, 202 insertions(+), 92 deletions(-) create mode 100644 m4/a52.m4 delete mode 100644 m4/gst-a52.m4 delete mode 100644 m4/gst-mpeg2dec.m4 create mode 100644 m4/mpeg2dec.m4 (limited to 'm4') diff --git a/m4/a52.m4 b/m4/a52.m4 new file mode 100644 index 00000000..fe89c1b7 --- /dev/null +++ b/m4/a52.m4 @@ -0,0 +1,121 @@ +dnl +dnl A52_CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME, +dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND, +dnl EXTRA-LDFLAGS, EXTRA-CPPFLAGS) +dnl +dnl FEATURE-NAME - feature name; library and header files are treated +dnl as feature, which we look for +dnl LIB-NAME - library name as in AC_CHECK_LIB macro +dnl LIB-FUNCTION - library symbol as in AC_CHECK_LIB macro +dnl HEADER-NAME - header file name as in AC_CHECK_HEADER +dnl ACTION-IF-FOUND - when feature is found then execute given action +dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action +dnl EXTRA-LDFLAGS - extra linker flags (-L or -l) +dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include +dnl +dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1. +dnl +AC_DEFUN(A52_CHECK_LIBHEADER, +[ + AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7]) + check_libheader_feature_name=translit([$1], A-Z, a-z) + + if test "x$HAVE_[$1]" = "xyes"; then + check_libheader_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="[$8] $CPPFLAGS" + AC_CHECK_HEADER([$4], :, HAVE_[$1]=no) + CPPFLAGS=$check_libheader_save_CPPFLAGS + fi + + if test "x$HAVE_[$1]" = "xyes"; then + ifelse([$5], , :, [$5]) + else + ifelse([$6], , :, [$6]) + fi +] +) + +dnl +dnl AC_CHECK_A52DEC(ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +dnl +dnl ACTION-IF-FOUND - when feature is found then execute given action +dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action +dnl +dnl Defines HAVE_A52DEC to yes if liba52 is found +dnl +dnl CFLAGS and LDFLAGS for the library are stored in A52DEC_CFLAGS and +dnl A52DEC_LIBS, respectively +dnl +dnl Based on GST_CHECK_A52DEC from gstreamer plugins 0.3.3.1 +dnl Thomas Vander Stichele , Andy Wingo +dnl +AC_DEFUN(AC_CHECK_A52DEC, +[dnl +AC_ARG_WITH(a52dec-prefix, + AC_HELP_STRING([--with-a52dec-prefix=PFX],[Prefix where a52dec is installed (optional)]), + a52dec_config_prefix="$withval", a52dec_config_prefix="") + +if test x$a52dec_config_prefix = x ; then + A52_CHECK_LIBHEADER(A52DEC, a52, a52_init, a52dec/a52.h, + A52DEC_LIBS="-la52 -lm", , -lm) +else + A52_CHECK_LIBHEADER(A52DEC, a52, a52_init, a52dec/a52.h, [ + A52DEC_LIBS="-la52 -L$a52dec_config_prefix/lib -lm" + A52DEC_CFLAGS="-I$a52dec_config_prefix/include" + ], , -L$a52dec_config_prefix/lib, -I$a52dec_config_prefix/include) +fi + +if test $HAVE_A52DEC = "yes"; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $A52DEC_CFLAGS" + LIBS="$A52DEC_LIBS $LIBS" + AC_TRY_RUN([ +#include +#include + +int +main () +{ + a52_state_t *state; + return 0; +} + ],, HAVE_A52DEC=no, [echo $ac_n "cross compiling; assumed OK... $ac_c"]) + + if test HAVE_A52DEC = "no"; then + echo "*** Your a52dec is borked somehow. Please update to 0.7.3." + else + AC_TRY_RUN([ +#include +#include + +int +main () +{ + int i = sizeof (a52_state_t); + return 0; +} + ], HAVE_A52DEC=no,, [echo $ac_n "cross compiling; assumed OK... $ac_c"]) + + if test HAVE_A52DEC = "no"; then + echo "*** Your a52dec is too old. Please update to 0.7.3." + fi + fi + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" +fi + +if test HAVE_A52DEC = "no"; then + A52DEC_CFLAGS="" + A52DEC_LIBS="" +fi + +if test "x$HAVE_A52DEC" = "xyes"; then + ifelse([$1], , :, [$1]) +else + ifelse([$2], , :, [$2]) +fi + +AC_SUBST(A52DEC_CFLAGS) +AC_SUBST(A52DEC_LIBS) +]) diff --git a/m4/check-libheader.m4 b/m4/check-libheader.m4 index 42db689b..120e9e23 100644 --- a/m4/check-libheader.m4 +++ b/m4/check-libheader.m4 @@ -21,20 +21,17 @@ AC_DEFUN(CHECK_LIBHEADER, check_libheader_feature_name=translit([$1], A-Z, a-z) if test "x$HAVE_[$1]" = "xyes"; then - check_libheader_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="[$8] $CPPFLAGS" AC_CHECK_HEADER([$4], :, HAVE_[$1]=no) CPPFLAGS=$check_libheader_save_CPPFLAGS + fi - if test "x$HAVE_[$1]" = "xyes"; then - dnl execute what needs to be - ifelse([$5], , :, [$5]) - AC_MSG_NOTICE(feature $check_libheader_feature_name is found) - else - ifelse([$6], , :, [$6]) - fi + if test "x$HAVE_[$1]" = "xyes"; then + ifelse([$5], , :, [$5]) + AC_MSG_NOTICE($check_libheader_feature_name was found) else + ifelse([$6], , :, [$6]) AC_MSG_WARN($check_libheader_feature_name not found) fi AC_SUBST(HAVE_[$1]) diff --git a/m4/gst-a52.m4 b/m4/gst-a52.m4 deleted file mode 100644 index 55d947a6..00000000 --- a/m4/gst-a52.m4 +++ /dev/null @@ -1,65 +0,0 @@ -AC_DEFUN(GST_CHECK_A52DEC, -[dnl -AC_ARG_WITH(a52dec-prefix, - AC_HELP_STRING([--with-a52dec-prefix=PFX],[Prefix where a52dec is installed (optional)]), - a52dec_config_prefix="$withval", a52dec_config_prefix="") - -if test x$a52dec_config_prefix = x ; then - CHECK_LIBHEADER(A52DEC, a52, a52_init, a52dec/a52.h, - A52DEC_LIBS="-la52 -lm", , -lm) -else - CHECK_LIBHEADER(A52DEC, a52, a52_init, a52dec/a52.h, [ - A52DEC_LIBS="-la52 -L$a52dec_config_prefix/lib -lm" - A52DEC_CFLAGS="-I$a52dec_config_prefix/include" - ], , -L$a52dec_config_prefix/lib, -I$a52dec_config_prefix/include) -fi - -if test $HAVE_A52DEC = "yes"; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $A52DEC_CFLAGS" - LIBS="$A52DEC_LIBS $LIBS" - AC_TRY_RUN([ -#include -#include - -int -main () -{ - a52_state_t *state; - return 0; -} - ],, HAVE_A52DEC=no, [echo $ac_n "cross compiling; assumed OK... $ac_c"]) - - if test HAVE_A52DEC = "no"; then - echo "*** Your a52dec is borked somehow. Please update to 0.7.3." - else - AC_TRY_RUN([ -#include -#include - -int -main () -{ - int i = sizeof (a52_state_t); - return 0; -} - ], HAVE_A52DEC=no,, [echo $ac_n "cross compiling; assumed OK... $ac_c"]) - - if test HAVE_A52DEC = "no"; then - echo "*** Your a52dec is too old. Please update to 0.7.3." - fi - fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" -fi - -if test HAVE_A52DEC = "no"; then - A52DEC_CFLAGS="" - A52DEC_LIBS="" -fi - -AC_SUBST(A52DEC_CFLAGS) -AC_SUBST(A52DEC_LIBS) -AC_SUBST(HAVE_A52DEC) -]) diff --git a/m4/gst-mpeg2dec.m4 b/m4/gst-mpeg2dec.m4 deleted file mode 100644 index 0a5785fe..00000000 --- a/m4/gst-mpeg2dec.m4 +++ /dev/null @@ -1,19 +0,0 @@ -AC_DEFUN(GST_CHECK_MPEG2DEC, -[dnl -AC_ARG_WITH(mpeg2dec-prefix, - [ --with-mpeg2dec-prefix=PFX Prefix where mpeg2dec is installed (optional)], - mpeg2dec_config_prefix="$withval", mpeg2dec_config_prefix="") - -if test x$mpeg2dec_config_prefix = x ; then - CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, - MPEG2DEC_LIBS="-lmpeg2 -lmpeg2dec") -else - CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, [ - MPEG2DEC_LIBS="-lmpeg2 -lmpeg2dec -L$mpeg2dec_config_prefix/lib" - MPEG2DEC_CFLAGS="-I$mpeg2dec_config_prefix/include" - ], , -L$mpeg2dec_config_prefix/lib, -I$mpeg2dec_config_prefix/include) -fi - -AC_SUBST(MPEG2DEC_CFLAGS) -AC_SUBST(MPEG2DEC_LIBS) -]) diff --git a/m4/mpeg2dec.m4 b/m4/mpeg2dec.m4 new file mode 100644 index 00000000..f5a4e85c --- /dev/null +++ b/m4/mpeg2dec.m4 @@ -0,0 +1,76 @@ +dnl +dnl MPEG2DEC_CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME, +dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND, +dnl EXTRA-LDFLAGS, EXTRA-CPPFLAGS) +dnl +dnl FEATURE-NAME - feature name; library and header files are treated +dnl as feature, which we look for +dnl LIB-NAME - library name as in AC_CHECK_LIB macro +dnl LIB-FUNCTION - library symbol as in AC_CHECK_LIB macro +dnl HEADER-NAME - header file name as in AC_CHECK_HEADER +dnl ACTION-IF-FOUND - when feature is found then execute given action +dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action +dnl EXTRA-LDFLAGS - extra linker flags (-L or -l) +dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include +dnl +dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1. +dnl +AC_DEFUN(MPEG2DEC_CHECK_LIBHEADER, +[ + AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7]) + check_libheader_feature_name=translit([$1], A-Z, a-z) + + if test "x$HAVE_[$1]" = "xyes"; then + check_libheader_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="[$8] $CPPFLAGS" + AC_CHECK_HEADER([$4], :, HAVE_[$1]=no) + CPPFLAGS=$check_libheader_save_CPPFLAGS + fi + + if test "x$HAVE_[$1]" = "xyes"; then + ifelse([$5], , :, [$5]) + else + ifelse([$6], , :, [$6]) + fi +] +) + +dnl +dnl AC_CHECK_MPEG2DEC(ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +dnl +dnl ACTION-IF-FOUND - when feature is found then execute given action +dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action +dnl +dnl Defines HAVE_MPEG2DEC to yes if mpeg2dec is found +dnl +dnl CFLAGS and LDFLAGS for the library are stored in MPEG2DEC_CFLAGS and +dnl MPEG2DEC_LIBS, respectively +dnl +dnl Based on GST_CHECK_MPEG2DEC from gstreamer plugins 0.3.3.1 +dnl Thomas Vander Stichele , Andy Wingo +dnl +AC_DEFUN(AC_CHECK_MPEG2DEC, +[dnl +AC_ARG_WITH(mpeg2dec-prefix, + [ --with-mpeg2dec-prefix=PFX Prefix where mpeg2dec is installed (optional)], + mpeg2dec_config_prefix="$withval", mpeg2dec_config_prefix="") + +if test x$mpeg2dec_config_prefix = x ; then + MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, + MPEG2DEC_LIBS="-lmpeg2 -lmpeg2dec") +else + MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, [ + MPEG2DEC_LIBS="-lmpeg2 -lmpeg2dec -L$mpeg2dec_config_prefix/lib" + MPEG2DEC_CFLAGS="-I$mpeg2dec_config_prefix/include" + ], , -L$mpeg2dec_config_prefix/lib, -I$mpeg2dec_config_prefix/include) +fi + +if test "x$HAVE_MPEG2DEC" = "xyes"; then + ifelse([$1], , :, [$1]) +else + ifelse([$2], , :, [$2]) +fi + +AC_SUBST(MPEG2DEC_CFLAGS) +AC_SUBST(MPEG2DEC_LIBS) +]) -- cgit v1.2.3