Attachment #60210 for bug #94543

View | Details | Raw Unified | Return to bug 94543
Collapse All | Expand All




  LIBQUICKTIME_EXTRA_CFLAGS="$LIBQUICKTIME_EXTRA_CFLAGS $xi"
  LIBQUICKTIME_EXTRA_CFLAGS=`echo $LIBQUICKTIME_EXTRA_CFLAGS | sed -e 's/  */ /g'`

  if test x"lqt/lqt.h" != x"" ; then
    ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

    save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $libquicktime_ii"
    if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
  echo "$as_me:$LINENO: checking for lqt/lqt.h" >&5
echo $ECHO_N "checking for lqt/lqt.h... $ECHO_C" >&6
if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
fi

echo "${ECHO_T}$ac_cv_header_quicktime_lqt_h" >&6
else
  # Is the header compilable?
echo "$as_me:$LINENO: checking lqt/lqt.h usability" >&5
echo $ECHO_N "checking lqt/lqt.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF

cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
$ac_includes_default
#include <lqt/lqt.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

echo "${ECHO_T}$ac_header_compiler" >&6

# Is the header present?
echo "$as_me:$LINENO: checking lqt/lqt.h presence" >&5
echo $ECHO_N "checking lqt/lqt.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <lqt/lqt.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: lqt/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: lqt/lqt.h: proceeding with the compiler's result" >&2;}
    ac_header_preproc=yes
    ;;
  no:yes:* )
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: lqt/lqt.h: present but cannot be compiled" >&2;}
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h:     check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: lqt/lqt.h:     check for missing prerequisite headers?" >&2;}
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: lqt/lqt.h: see the Autoconf documentation" >&2;}
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h:     section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: lqt/lqt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: lqt/lqt.h: proceeding with the preprocessor's result" >&2;}
    { echo "$as_me:$LINENO: WARNING: lqt/lqt.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: lqt/lqt.h: in the future, the compiler will take precedence" >&2;}
    (
      cat <<\_ASBOX
## ------------------------------------ ##

      sed "s/^/$as_me: WARNING:     /" >&2
    ;;
esac
echo "$as_me:$LINENO: checking for lqt/lqt.h" >&5
echo $ECHO_N "checking for lqt/lqt.h... $ECHO_C" >&6
if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else

if test $ac_cv_header_quicktime_lqt_h = yes; then
  LIBQUICKTIME_CFLAGS="$libquicktime_ii"
else
  { { echo "$as_me:$LINENO: error: libquicktime requested, but cannot compile lqt/lqt.h" >&5
echo "$as_me: error: libquicktime requested, but cannot compile lqt/lqt.h" >&2;}
   { (exit 1); exit 1; }; }
fi


Lines 955-961 Link Here

(-)transcode-0.6.14.orig/configure.in (-1 / +1 lines)
955	dnl	955	dnl
956	LIBQUICKTIME_EXTRA_LIBS="$LIBQUICKTIME_EXTRA_LIBS -lpng -lz $PTHREAD_LIBS -lm $LIBDV_LIBS"	956	LIBQUICKTIME_EXTRA_LIBS="$LIBQUICKTIME_EXTRA_LIBS -lpng -lz $PTHREAD_LIBS -lm $LIBDV_LIBS"
957	TC_PATH_PKG(libquicktime, no, LIBQUICKTIME, libquicktime, lqt-config,	957	TC_PATH_PKG(libquicktime, no, LIBQUICKTIME, libquicktime, lqt-config,
958	[C], [quicktime/lqt.h], quicktime, quicktime_open)	958	[C], [lqt/lqt.h], quicktime, quicktime_open)
959	if test x"$have_libquicktime" = x"yes" ; then	959	if test x"$have_libquicktime" = x"yes" ; then
960	AC_DEFINE([HAVE_LIBQUICKTIME], 1, [have libquicktime support])	960	AC_DEFINE([HAVE_LIBQUICKTIME], 1, [have libquicktime support])
961	AC_CHECK_LIB(quicktime, lqt_encode_video,	961	AC_CHECK_LIB(quicktime, lqt_encode_video,

Lines 50-58 Link Here

(-)transcode-0.6.14.orig/export/export_mov.c (-3 / +3 lines)
50	#define MOD_PRE mov	50	#define MOD_PRE mov
51	#include "export_def.h"	51	#include "export_def.h"
52		52
53	#include <quicktime/quicktime.h>	53	#include <lqt/quicktime.h>
54	#include <quicktime/colormodels.h>	54	#include <lqt/colormodels.h>
55	#include <quicktime/lqt.h>	55	#include <lqt/lqt.h>
56		56
57	#define QT_LIST_AUDIO "audio codec"	57	#define QT_LIST_AUDIO "audio codec"
58	#define QT_LIST_VIDEO "video codec"	58	#define QT_LIST_VIDEO "video codec"

Lines 31-37 Link Here

(-)transcode-0.6.14.orig/import/decode_mov.c (-1 / +1 lines)
31	#include "config.h"	31	#include "config.h"
32		32
33	#ifdef HAVE_LIBQUICKTIME	33	#ifdef HAVE_LIBQUICKTIME
34	#include <quicktime/quicktime.h>	34	#include <lqt/quicktime.h>
35	#endif	35	#endif
36		36
37	#include "transcode.h"	37	#include "transcode.h"

Lines 26-34 Link Here

(-)transcode-0.6.14.orig/import/import_mov.c (-3 / +3 lines)
26	#include <stdlib.h>	26	#include <stdlib.h>
27	#include <unistd.h>	27	#include <unistd.h>
28	#include <string.h>	28	#include <string.h>
29	#include <quicktime/quicktime.h>	29	#include <lqt/quicktime.h>
30	#include <quicktime/colormodels.h>	30	#include <lqt/colormodels.h>
31	#include <quicktime/lqt.h>	31	#include <lqt/lqt.h>
32	#include "transcode.h"	32	#include "transcode.h"
33	#include "magic.h"	33	#include "magic.h"
34		34

Lines 28-34 Link Here

(-)transcode-0.6.14.orig/import/probe_mov.c (-1 / +1 lines)
28		28
29	extern int binary_dump;	29	extern int binary_dump;
30		30
31	#include <quicktime/quicktime.h>	31	#include <lqt/quicktime.h>
32		32
33	void probe_mov(info_t *ipipe)	33	void probe_mov(info_t *ipipe)
34	{	34	{

Return to bug 94543

Lines 33443-33449 Link Here

(-)transcode-0.6.14.orig/configure (-29 / +29 lines)
33443	LIBQUICKTIME_EXTRA_CFLAGS="$LIBQUICKTIME_EXTRA_CFLAGS $xi"	33443	LIBQUICKTIME_EXTRA_CFLAGS="$LIBQUICKTIME_EXTRA_CFLAGS $xi"
33444	LIBQUICKTIME_EXTRA_CFLAGS=`echo $LIBQUICKTIME_EXTRA_CFLAGS \| sed -e 's/ */ /g'`	33444	LIBQUICKTIME_EXTRA_CFLAGS=`echo $LIBQUICKTIME_EXTRA_CFLAGS \| sed -e 's/ */ /g'`
33445		33445
33446	if test x"quicktime/lqt.h" != x"" ; then	33446	if test x"lqt/lqt.h" != x"" ; then
33447	ac_ext=c	33447	ac_ext=c
33448	ac_cpp='$CPP $CPPFLAGS'	33448	ac_cpp='$CPP $CPPFLAGS'
33449	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'	33449	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Lines 33453-33460 Link Here
33453	save_CPPFLAGS="$CPPFLAGS"	33453	save_CPPFLAGS="$CPPFLAGS"
33454	CPPFLAGS="$CPPFLAGS $libquicktime_ii"	33454	CPPFLAGS="$CPPFLAGS $libquicktime_ii"
33455	if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then	33455	if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
33456	echo "$as_me:$LINENO: checking for quicktime/lqt.h" >&5	33456	echo "$as_me:$LINENO: checking for lqt/lqt.h" >&5
33457	echo $ECHO_N "checking for quicktime/lqt.h... $ECHO_C" >&6	33457	echo $ECHO_N "checking for lqt/lqt.h... $ECHO_C" >&6
33458	if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then	33458	if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
33459	echo $ECHO_N "(cached) $ECHO_C" >&6	33459	echo $ECHO_N "(cached) $ECHO_C" >&6
33460	fi	33460	fi
Lines 33462-33469 Link Here
33462	echo "${ECHO_T}$ac_cv_header_quicktime_lqt_h" >&6	33462	echo "${ECHO_T}$ac_cv_header_quicktime_lqt_h" >&6
33463	else	33463	else
33464	# Is the header compilable?	33464	# Is the header compilable?
33465	echo "$as_me:$LINENO: checking quicktime/lqt.h usability" >&5	33465	echo "$as_me:$LINENO: checking lqt/lqt.h usability" >&5
33466	echo $ECHO_N "checking quicktime/lqt.h usability... $ECHO_C" >&6	33466	echo $ECHO_N "checking lqt/lqt.h usability... $ECHO_C" >&6
33467	cat >conftest.$ac_ext <<_ACEOF	33467	cat >conftest.$ac_ext <<_ACEOF
33468	/* confdefs.h. */	33468	/* confdefs.h. */
33469	_ACEOF	33469	_ACEOF
Lines 33471-33477 Link Here
33471	cat >>conftest.$ac_ext <<_ACEOF	33471	cat >>conftest.$ac_ext <<_ACEOF
33472	/* end confdefs.h. */	33472	/* end confdefs.h. */
33473	$ac_includes_default	33473	$ac_includes_default
33474	#include <quicktime/lqt.h>	33474	#include <lqt/lqt.h>
33475	_ACEOF	33475	_ACEOF
33476	rm -f conftest.$ac_objext	33476	rm -f conftest.$ac_objext
33477	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5	33477	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
Lines 33507-33521 Link Here
33507	echo "${ECHO_T}$ac_header_compiler" >&6	33507	echo "${ECHO_T}$ac_header_compiler" >&6
33508		33508
33509	# Is the header present?	33509	# Is the header present?
33510	echo "$as_me:$LINENO: checking quicktime/lqt.h presence" >&5	33510	echo "$as_me:$LINENO: checking lqt/lqt.h presence" >&5
33511	echo $ECHO_N "checking quicktime/lqt.h presence... $ECHO_C" >&6	33511	echo $ECHO_N "checking lqt/lqt.h presence... $ECHO_C" >&6
33512	cat >conftest.$ac_ext <<_ACEOF	33512	cat >conftest.$ac_ext <<_ACEOF
33513	/* confdefs.h. */	33513	/* confdefs.h. */
33514	_ACEOF	33514	_ACEOF
33515	cat confdefs.h >>conftest.$ac_ext	33515	cat confdefs.h >>conftest.$ac_ext
33516	cat >>conftest.$ac_ext <<_ACEOF	33516	cat >>conftest.$ac_ext <<_ACEOF
33517	/* end confdefs.h. */	33517	/* end confdefs.h. */
33518	#include <quicktime/lqt.h>	33518	#include <lqt/lqt.h>
33519	_ACEOF	33519	_ACEOF
33520	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5	33520	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
33521	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1	33521	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Lines 33549-33573 Link Here
33549	# So? What about this header?	33549	# So? What about this header?
33550	case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in	33550	case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
33551	yes:no: )	33551	yes:no: )
33552	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&5	33552	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&5
33553	echo "$as_me: WARNING: quicktime/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}	33553	echo "$as_me: WARNING: lqt/lqt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
33554	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: proceeding with the compiler's result" >&5	33554	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: proceeding with the compiler's result" >&5
33555	echo "$as_me: WARNING: quicktime/lqt.h: proceeding with the compiler's result" >&2;}	33555	echo "$as_me: WARNING: lqt/lqt.h: proceeding with the compiler's result" >&2;}
33556	ac_header_preproc=yes	33556	ac_header_preproc=yes
33557	;;	33557	;;
33558	no:yes:* )	33558	no:yes:* )
33559	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: present but cannot be compiled" >&5	33559	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: present but cannot be compiled" >&5
33560	echo "$as_me: WARNING: quicktime/lqt.h: present but cannot be compiled" >&2;}	33560	echo "$as_me: WARNING: lqt/lqt.h: present but cannot be compiled" >&2;}
33561	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: check for missing prerequisite headers?" >&5	33561	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: check for missing prerequisite headers?" >&5
33562	echo "$as_me: WARNING: quicktime/lqt.h: check for missing prerequisite headers?" >&2;}	33562	echo "$as_me: WARNING: lqt/lqt.h: check for missing prerequisite headers?" >&2;}
33563	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: see the Autoconf documentation" >&5	33563	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: see the Autoconf documentation" >&5
33564	echo "$as_me: WARNING: quicktime/lqt.h: see the Autoconf documentation" >&2;}	33564	echo "$as_me: WARNING: lqt/lqt.h: see the Autoconf documentation" >&2;}
33565	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: section \"Present But Cannot Be Compiled\"" >&5	33565	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: section \"Present But Cannot Be Compiled\"" >&5
33566	echo "$as_me: WARNING: quicktime/lqt.h: section \"Present But Cannot Be Compiled\"" >&2;}	33566	echo "$as_me: WARNING: lqt/lqt.h: section \"Present But Cannot Be Compiled\"" >&2;}
33567	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: proceeding with the preprocessor's result" >&5	33567	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: proceeding with the preprocessor's result" >&5
33568	echo "$as_me: WARNING: quicktime/lqt.h: proceeding with the preprocessor's result" >&2;}	33568	echo "$as_me: WARNING: lqt/lqt.h: proceeding with the preprocessor's result" >&2;}
33569	{ echo "$as_me:$LINENO: WARNING: quicktime/lqt.h: in the future, the compiler will take precedence" >&5	33569	{ echo "$as_me:$LINENO: WARNING: lqt/lqt.h: in the future, the compiler will take precedence" >&5
33570	echo "$as_me: WARNING: quicktime/lqt.h: in the future, the compiler will take precedence" >&2;}	33570	echo "$as_me: WARNING: lqt/lqt.h: in the future, the compiler will take precedence" >&2;}
33571	(	33571	(
33572	cat <<\_ASBOX	33572	cat <<\_ASBOX
33573	## ------------------------------------ ##	33573	## ------------------------------------ ##
Lines 33578-33585 Link Here
33578	sed "s/^/$as_me: WARNING: /" >&2	33578	sed "s/^/$as_me: WARNING: /" >&2
33579	;;	33579	;;
33580	esac	33580	esac
33581	echo "$as_me:$LINENO: checking for quicktime/lqt.h" >&5	33581	echo "$as_me:$LINENO: checking for lqt/lqt.h" >&5
33582	echo $ECHO_N "checking for quicktime/lqt.h... $ECHO_C" >&6	33582	echo $ECHO_N "checking for lqt/lqt.h... $ECHO_C" >&6
33583	if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then	33583	if test "${ac_cv_header_quicktime_lqt_h+set}" = set; then
33584	echo $ECHO_N "(cached) $ECHO_C" >&6	33584	echo $ECHO_N "(cached) $ECHO_C" >&6
33585	else	33585	else
Lines 33592-33599 Link Here
33592	if test $ac_cv_header_quicktime_lqt_h = yes; then	33592	if test $ac_cv_header_quicktime_lqt_h = yes; then
33593	LIBQUICKTIME_CFLAGS="$libquicktime_ii"	33593	LIBQUICKTIME_CFLAGS="$libquicktime_ii"
33594	else	33594	else
33595	{ { echo "$as_me:$LINENO: error: libquicktime requested, but cannot compile quicktime/lqt.h" >&5	33595	{ { echo "$as_me:$LINENO: error: libquicktime requested, but cannot compile lqt/lqt.h" >&5
33596	echo "$as_me: error: libquicktime requested, but cannot compile quicktime/lqt.h" >&2;}	33596	echo "$as_me: error: libquicktime requested, but cannot compile lqt/lqt.h" >&2;}
33597	{ (exit 1); exit 1; }; }	33597	{ (exit 1); exit 1; }; }
33598	fi	33598	fi
33599		33599