[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd configure configure.in
|
From: |
Edward Rosten |
|
Subject: |
[libcvd-members] libcvd configure configure.in |
|
Date: |
Sat, 11 Aug 2007 05:25:42 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Edward Rosten <edrosten> 07/08/11 05:25:42
Modified files:
. : configure configure.in
Log message:
Minor fix. Seems to help some builds of ffmpeg.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.92&r2=1.93
Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- configure 8 Aug 2007 22:07:08 -0000 1.92
+++ configure 11 Aug 2007 05:25:42 -0000 1.93
@@ -8778,13 +8778,13 @@
fi
-echo "$as_me:$LINENO: checking for avcodec_open in -lavcodec" >&5
-echo $ECHO_N "checking for avcodec_open in -lavcodec... $ECHO_C" >&6
-if test "${ac_cv_lib_avcodec_avcodec_open+set}" = set; then
+echo "$as_me:$LINENO: checking for av_open_input_file in -lavformat" >&5
+echo $ECHO_N "checking for av_open_input_file in -lavformat... $ECHO_C" >&6
+if test "${ac_cv_lib_avformat_av_open_input_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavcodec $LIBS"
+LIBS="-lavformat $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8798,11 +8798,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char avcodec_open ();
+char av_open_input_file ();
int
main ()
{
-avcodec_open ();
+av_open_input_file ();
;
return 0;
}
@@ -8829,32 +8829,32 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_avcodec_avcodec_open=yes
+ ac_cv_lib_avformat_av_open_input_file=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_avcodec_avcodec_open=no
+ac_cv_lib_avformat_av_open_input_file=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_avcodec_open" >&5
-echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_open" >&6
-if test $ac_cv_lib_avcodec_avcodec_open = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_open_input_file" >&5
+echo "${ECHO_T}$ac_cv_lib_avformat_av_open_input_file" >&6
+if test $ac_cv_lib_avformat_av_open_input_file = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVCODEC 1
+#define HAVE_LIBAVFORMAT 1
_ACEOF
- LIBS="-lavcodec $LIBS"
+ LIBS="-lavformat $LIBS"
fi
-echo "$as_me:$LINENO: checking for av_open_input_file in -lavformat" >&5
-echo $ECHO_N "checking for av_open_input_file in -lavformat... $ECHO_C" >&6
-if test "${ac_cv_lib_avformat_av_open_input_file+set}" = set; then
+echo "$as_me:$LINENO: checking for av_read_frame in -lavformat" >&5
+echo $ECHO_N "checking for av_read_frame in -lavformat... $ECHO_C" >&6
+if test "${ac_cv_lib_avformat_av_read_frame+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -8872,11 +8872,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char av_open_input_file ();
+char av_read_frame ();
int
main ()
{
-av_open_input_file ();
+av_read_frame ();
;
return 0;
}
@@ -8903,20 +8903,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_avformat_av_open_input_file=yes
+ ac_cv_lib_avformat_av_read_frame=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_avformat_av_open_input_file=no
+ac_cv_lib_avformat_av_read_frame=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_open_input_file" >&5
-echo "${ECHO_T}$ac_cv_lib_avformat_av_open_input_file" >&6
-if test $ac_cv_lib_avformat_av_open_input_file = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_read_frame" >&5
+echo "${ECHO_T}$ac_cv_lib_avformat_av_read_frame" >&6
+if test $ac_cv_lib_avformat_av_read_frame = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBAVFORMAT 1
_ACEOF
@@ -8924,15 +8924,15 @@
LIBS="-lavformat $LIBS"
fi
+ #only in >= 0.4.9
-
-echo "$as_me:$LINENO: checking for av_read_frame in -lavformat" >&5
-echo $ECHO_N "checking for av_read_frame in -lavformat... $ECHO_C" >&6
-if test "${ac_cv_lib_avformat_av_read_frame+set}" = set; then
+echo "$as_me:$LINENO: checking for avcodec_open in -lavcodec" >&5
+echo $ECHO_N "checking for avcodec_open in -lavcodec... $ECHO_C" >&6
+if test "${ac_cv_lib_avcodec_avcodec_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lavformat $LIBS"
+LIBS="-lavcodec $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8946,11 +8946,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char av_read_frame ();
+char avcodec_open ();
int
main ()
{
-av_read_frame ();
+avcodec_open ();
;
return 0;
}
@@ -8977,28 +8977,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_avformat_av_read_frame=yes
+ ac_cv_lib_avcodec_avcodec_open=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_avformat_av_read_frame=no
+ac_cv_lib_avcodec_avcodec_open=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_read_frame" >&5
-echo "${ECHO_T}$ac_cv_lib_avformat_av_read_frame" >&6
-if test $ac_cv_lib_avformat_av_read_frame = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_avcodec_avcodec_open" >&5
+echo "${ECHO_T}$ac_cv_lib_avcodec_avcodec_open" >&6
+if test $ac_cv_lib_avcodec_avcodec_open = yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAVFORMAT 1
+#define HAVE_LIBAVCODEC 1
_ACEOF
- LIBS="-lavformat $LIBS"
+ LIBS="-lavcodec $LIBS"
fi
- #only in >= 0.4.9
+
if test
"$ac_cv_lib_avcodec_avcodec_open$ac_cv_lib_avformat_av_open_input_file" = yesyes
then
if test "$ac_cv_lib_avformat_av_read_frame" = yes
Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- configure.in 8 Aug 2007 22:07:08 -0000 1.92
+++ configure.in 11 Aug 2007 05:25:42 -0000 1.93
@@ -1047,9 +1047,9 @@
a=
AC_CHECK_HEADERS(ffmpeg/avcodec.h ffmpeg/avformat.h, [], [break])
AC_CHECK_LIB(avutil, main)
- AC_CHECK_LIB(avcodec, avcodec_open)
AC_CHECK_LIB(avformat, av_open_input_file)
AC_CHECK_LIB(avformat, av_read_frame) #only in >= 0.4.9
+ AC_CHECK_LIB(avcodec, avcodec_open)
if test
"$ac_cv_lib_avcodec_avcodec_open$ac_cv_lib_avformat_av_open_input_file" = yesyes
then
if test "$ac_cv_lib_avformat_av_read_frame" = yes