Skip to content

Commit 82235ac

Browse files
madmartinmadmartin
committed
Checkin noad-0.8.2
1 parent c5ecb62 commit 82235ac

8 files changed

+66
-200
lines changed

‎configure

+24-38
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.68 for noad 0.8.0.
3+
# Generated by GNU Autoconf 2.68 for noad 0.8.2.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -560,8 +560,8 @@ MAKEFLAGS=
560560
# Identity of this package.
561561
PACKAGE_NAME='noad'
562562
PACKAGE_TARNAME='noad'
563-
PACKAGE_VERSION='0.8.0'
564-
PACKAGE_STRING='noad 0.8.0'
563+
PACKAGE_VERSION='0.8.2'
564+
PACKAGE_STRING='noad 0.8.2'
565565
PACKAGE_BUGREPORT='[email protected]'
566566
PACKAGE_URL=''
567567

@@ -1287,7 +1287,7 @@ if test "$ac_init_help" = "long"; then
12871287
# Omit some internal or obsolete options to make the list less imposing.
12881288
# This message is too long to be a string in the A/UX 3.1 sh.
12891289
cat <<_ACEOF
1290-
\`configure' configures noad 0.8.0 to adapt to many kinds of systems.
1290+
\`configure' configures noad 0.8.2 to adapt to many kinds of systems.
12911291
12921292
Usage: $0 [OPTION]... [VAR=VALUE]...
12931293
@@ -1353,7 +1353,7 @@ fi
13531353

13541354
if test -n "$ac_init_help"; then
13551355
case $ac_init_help in
1356-
short | recursive ) echo "Configuration of noad 0.8.0:";;
1356+
short | recursive ) echo "Configuration of noad 0.8.2:";;
13571357
esac
13581358
cat <<\_ACEOF
13591359
@@ -1467,7 +1467,7 @@ fi
14671467
test -n "$ac_init_help" && exit $ac_status
14681468
if $ac_init_version; then
14691469
cat <<\_ACEOF
1470-
noad configure 0.8.0
1470+
noad configure 0.8.2
14711471
generated by GNU Autoconf 2.68
14721472
14731473
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2031,7 +2031,7 @@ cat >config.log <<_ACEOF
20312031
This file contains any messages produced by compilers while
20322032
running configure, to aid debugging if configure makes a mistake.
20332033
2034-
It was created by noad $as_me 0.8.0, which was
2034+
It was created by noad $as_me 0.8.2, which was
20352035
generated by GNU Autoconf 2.68. Invocation command line was
20362036
20372037
$ $0 $@
@@ -2846,7 +2846,7 @@ fi
28462846
28472847
# Define the identity of the package.
28482848
PACKAGE='noad'
2849-
VERSION='0.8.0'
2849+
VERSION='0.8.2'
28502850
28512851
28522852
cat >>confdefs.h <<_ACEOF
@@ -5907,7 +5907,6 @@ fi
59075907
done
59085908
59095909
#CXXFLAGS='-g -O3 -pg'
5910-
CXXFLAGS='-g -O3'
59115910
59125911
ac_fn_cxx_check_decl "$LINENO" "posix_fadvise" "ac_cv_have_decl_posix_fadvise" "
59135912
#include <fcntl.h>
@@ -6014,18 +6013,19 @@ if test "$PKG_LIBMPEG2" == "1"; then
60146013
$as_echo "$as_me: found libmpeg2 Version $LIBMPEG_VERSION" >&6;}
60156014
LIBMPEGX=$LIBMPEG2_LIBS
60166015
6016+
{ $as_echo "$as_me:${as_lineno-$LINENO}: LIBMPEG2_LIBS=$LIBMPEG2_LIBS" >&5
6017+
$as_echo "$as_me: LIBMPEG2_LIBS=$LIBMPEG2_LIBS" >&6;}
60176018
60186019
60196020
# Check whether --with-libmpeg2-static was given.
60206021
if test "${with_libmpeg2_static+set}" = set; then :
6021-
withval=$with_libmpeg2_static; LIBMPEGX="-Xlinker -Bstatic $LIBMPEG2_LIBS -Xlinker -Bdynamic"
6022+
withval=$with_libmpeg2_static; LIBMPEGX="-Wl,--trace -Xlinker -Bstatic $LIBMPEG2_LIBS -lmpeg2convert -Xlinker -Bdynamic"
60226023
60236024
fi
60246025
6026+
CPPFLAGS=" $CPPFLAGS -DUSE_LIBMPGE2 $LIBMPEG2_CFLAGS"
6027+
LIBS="$LIBS $LIBMPEGX "
60256028
6026-
CPPFLAGS="$LIBMPEG2_CFLAGS $CPPFLAGS"
6027-
CXXFLAGS="-DUSE_LIBMPGE2 $CXXFLAGS"
6028-
LDFLAGS="$LDFLAGS $LIBMPEGX"
60296029
HAVE_LIBMPEG2=1
60306030
60316031
libmpeg2ok=1
@@ -6035,6 +6035,7 @@ fi
60356035
fi
60366036
60376037
6038+
60386039
# Need libavcodec 52.26.0 for avcodec_decode_video2
60396040
ffmpegok=0
60406041
@@ -6113,43 +6114,33 @@ if test "$HAVE_FFMPEG" == "1"; then
61136114
$as_echo "$as_me: found libavcodec Version $LIBAVCODEC_VERSION" >&6;}
61146115
OLDLDFLAGS="$LDFLAGS"
61156116
OLDCXXFLAGS="$CXXFLAGS"
6116-
LDFLAGS="$LDFLAGS $FFMPEG_LIBS"
6117-
CXXFLAGS="$FFMPEG_CFLAGS $CXXFLAGS"
6118-
ac_fn_cxx_check_header_mongrel "$LINENO" "libavformat/url.h" "ac_cv_header_libavformat_url_h" "$ac_includes_default"
6119-
if test "x$ac_cv_header_libavformat_url_h" = xyes; then :
6120-
HAVE_URLCONTEXT=1
6121-
else
6122-
HAVE_URLCONTEXT=0
6123-
fi
6124-
6125-
6126-
ac_fn_cxx_check_member "$LINENO" "AVIOContext" "av_class" "ac_cv_member_AVIOContext_av_class" "#include \"libavformat/avformat.h\"
6117+
OLDLIBS="$LIBS"
6118+
LIBS="$LIBS $FFMPEG_LIBS"
6119+
CXXFLAGS="$FFMPEG_CFLAGS $CXXFLAGS"
6120+
ac_fn_cxx_check_member "$LINENO" "AVIOContext" "read_packet" "ac_cv_member_AVIOContext_read_packet" "#include \"libavformat/avformat.h\"
61276121
"
6128-
if test "x$ac_cv_member_AVIOContext_av_class" = xyes; then :
6122+
if test "x$ac_cv_member_AVIOContext_read_packet" = xyes; then :
61296123
HAVE_AVIOCONTEXT=1
61306124
else
61316125
HAVE_AVIOCONTEXT=0
61326126
fi
61336127
61346128
if test "$HAVE_AVIOCONTEXT" == "1"; then
61356129
CPPFLAGS="-DUSE_AVIOCONTEXT $CPPFLAGS"
6136-
else
6137-
if test "$HAVE_URLCONTEXT" == "1"; then
6138-
CPPFLAGS="-DUSE_URLCONTEXT $CPPFLAGS"
6139-
fi
61406130
fi
6141-
if test "$HAVE_AVIOCONTEXT" == "0" && test "$HAVE_URLCONTEXT" == "0" ; then
6131+
if test "$HAVE_AVIOCONTEXT" == "0" ; then
61426132
echo ffmpeg not usable
61436133
HAVE_FFMPEG=0
61446134
LDFLAGS="$OLDLDFLAGS"
61456135
CXXFLAGS="$OLDCXXFLAGS"
6136+
LIBS="$OLDLIBS"
61466137
else
61476138
ffmpegok=1
61486139
61496140
decoderok=1
61506141
61516142
CXXFLAGS="-DUSE_FFMPEG $CXXFLAGS"
6152-
fi
6143+
fi
61536144
fi
61546145
61556146
@@ -6287,7 +6278,6 @@ fi
62876278
test $withtools -eq 1 && TOOLSRC="showindex"
62886279
62896280
6290-
62916281
CFLAGS="$CFLAGS -DFFMPEGDECODING"
62926282
CPPFLAGS="$CPPFLAGS -DFFMPEGDECODING "
62936283
@@ -6839,7 +6829,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
68396829
# report actual input values of CONFIG_FILES etc. instead of their
68406830
# values after options handling.
68416831
ac_log="
6842-
This file was extended by noad $as_me 0.8.0, which was
6832+
This file was extended by noad $as_me 0.8.2, which was
68436833
generated by GNU Autoconf 2.68. Invocation command line was
68446834
68456835
CONFIG_FILES = $CONFIG_FILES
@@ -6905,7 +6895,7 @@ _ACEOF
69056895
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
69066896
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
69076897
ac_cs_version="\\
6908-
noad config.status 0.8.0
6898+
noad config.status 0.8.2
69096899
configured by $0, generated by GNU Autoconf 2.68,
69106900
with options \\"\$ac_cs_config\\"
69116901
@@ -7770,13 +7760,9 @@ fi
77707760
echo " this is noad Version $VERSION"
77717761
if test "$libmpeg2ok" == "1" ; then
77727762
echo " configured with libmpeg2 Version $LIBMPEG_VERSION"
7773-
echo " CFLAGS=$LIBMPEG2_CFLAGS"
7774-
echo " LDFLAGS=$LIBMPEG2_LIBS"
77757763
fi
77767764
if test "$ffmpegok" == "1" ; then
77777765
echo " configured with libavcodec Version $LIBAVCODEC_VERSION"
7778-
echo " CFLAGS=$FFMPEG_CFLAGS"
7779-
echo " LDFLAGS=$FFMPEG_LIBS"
77807766
else
77817767
echo " ffmpeg-support not configured"
77827768
fi

‎configure.ac

+15-20
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl ---------------------------------------------------------------------------
1010
dnl initialisation
1111
dnl ---------------------------------------------------------------------------
1212
AC_PREREQ(2.57)
13-
AC_INIT(noad, 0.8.0, [email protected])
13+
AC_INIT(noad, 0.8.2, [email protected])
1414
AM_INIT_AUTOMAKE(dist-bzip2)
1515
AM_SILENT_RULES([yes])
1616
AC_CONFIG_SRCDIR([cchecklogo.cpp])
@@ -72,7 +72,7 @@ AC_FUNC_STRFTIME
7272
AC_CHECK_FUNCS([gettimeofday localtime_r memmove memset mkdir select socket strchr strdup strerror strrchr strstr])
7373
AC_CHECK_FUNCS([strsignal])
7474
#CXXFLAGS='-g -O3 -pg'
75-
CXXFLAGS='-g -O3'
75+
dnl CXXFLAGS='-v -g -O3'
7676

7777
dnl ---------------------------------------------------------------------------
7878
dnl check for posix_fadvise
@@ -94,23 +94,23 @@ if test "$PKG_LIBMPEG2" == "1"; then
9494
LIBMPEG_VERSION="`pkg-config --modversion libmpeg2`"
9595
AC_MSG_NOTICE([found libmpeg2 Version $LIBMPEG_VERSION])
9696
AC_SUBST(LIBMPEGX,$LIBMPEG2_LIBS)
97+
AC_MSG_NOTICE([LIBMPEG2_LIBS=$LIBMPEG2_LIBS])
9798

9899
dnl ---------------------------------------------------------------------------
99100
dnl setup for forcing static linking of libmpeg2
100101
dnl ---------------------------------------------------------------------------
101102
AC_ARG_WITH(libmpeg2-static,
102103
AC_HELP_STRING([--with-libmpeg2-static],[force linking of static version of libmpeg2]),
103-
[AC_SUBST(LIBMPEGX,"-Xlinker -Bstatic $LIBMPEG2_LIBS -Xlinker -Bdynamic")])
104-
105-
CPPFLAGS="$LIBMPEG2_CFLAGS $CPPFLAGS"
106-
CXXFLAGS="-DUSE_LIBMPGE2 $CXXFLAGS"
107-
LDFLAGS="$LDFLAGS $LIBMPEGX"
104+
[AC_SUBST(LIBMPEGX,["-Wl,--trace -Xlinker -Bstatic $LIBMPEG2_LIBS -lmpeg2convert -Xlinker -Bdynamic"])])
105+
CPPFLAGS=" $CPPFLAGS -DUSE_LIBMPGE2 $LIBMPEG2_CFLAGS"
106+
AC_SUBST(LIBS,"$LIBS $LIBMPEGX ")
108107
AC_SUBST(HAVE_LIBMPEG2,1)
109108
AC_SUBST(libmpeg2ok,1)
110109
AC_SUBST(decoderok,1)
111110
fi
112111

113112

113+
114114
dnl ---------------------------------------------------------------------------
115115
dnl check for libavcodec(ffmpeg)
116116
dnl ---------------------------------------------------------------------------
@@ -122,26 +122,25 @@ if test "$HAVE_FFMPEG" == "1"; then
122122
AC_MSG_NOTICE([found libavcodec Version $LIBAVCODEC_VERSION])
123123
OLDLDFLAGS="$LDFLAGS"
124124
OLDCXXFLAGS="$CXXFLAGS"
125-
LDFLAGS="$LDFLAGS $FFMPEG_LIBS"
125+
OLDLIBS="$LIBS"
126+
LIBS="$LIBS $FFMPEG_LIBS"
127+
dnl LDFLAGS="$LDFLAGS $FFMPEG_LIBS"
126128
CXXFLAGS="$FFMPEG_CFLAGS $CXXFLAGS"
127-
AC_CHECK_HEADER(libavformat/url.h,HAVE_URLCONTEXT=1, HAVE_URLCONTEXT=0)
128-
AC_CHECK_MEMBER(AVIOContext.av_class,HAVE_AVIOCONTEXT=1, HAVE_AVIOCONTEXT=0,[#include "libavformat/avformat.h"])
129+
AC_CHECK_MEMBER(AVIOContext.read_packet,HAVE_AVIOCONTEXT=1, HAVE_AVIOCONTEXT=0,[#include "libavformat/avformat.h"])
129130
if test "$HAVE_AVIOCONTEXT" == "1"; then
130131
CPPFLAGS="-DUSE_AVIOCONTEXT $CPPFLAGS"
131-
else
132-
if test "$HAVE_URLCONTEXT" == "1"; then
133-
CPPFLAGS="-DUSE_URLCONTEXT $CPPFLAGS"
134-
fi
135132
fi
136-
if test "$HAVE_AVIOCONTEXT" == "0" && test "$HAVE_URLCONTEXT" == "0" ; then
133+
if test "$HAVE_AVIOCONTEXT" == "0" ; then
137134
echo ffmpeg not usable
138135
HAVE_FFMPEG=0
139136
LDFLAGS="$OLDLDFLAGS"
140137
CXXFLAGS="$OLDCXXFLAGS"
138+
LIBS="$OLDLIBS"
141139
else
142140
AC_SUBST(ffmpegok,1)
143141
AC_SUBST(decoderok,1)
144142
CXXFLAGS="-DUSE_FFMPEG $CXXFLAGS"
143+
dnl AC_SUBST(LIBS,"$LIBS $FFMPEG_LIBS")
145144
fi
146145
fi
147146

@@ -191,7 +190,7 @@ test $withtools -eq 1 && TOOLSRC="showindex"
191190

192191
dnl LDFLAGS="$LDFLAGS -rdynamic"
193192

194-
193+
dnl CXXFLAGS="-v -g -O3 $CXXFLAGS"
195194
CFLAGS="$CFLAGS -DFFMPEGDECODING"
196195
CPPFLAGS="$CPPFLAGS -DFFMPEGDECODING "
197196

@@ -215,13 +214,9 @@ else
215214
echo " this is noad Version $VERSION"
216215
if test "$libmpeg2ok" == "1" ; then
217216
echo " configured with libmpeg2 Version $LIBMPEG_VERSION"
218-
echo " CFLAGS=$LIBMPEG2_CFLAGS"
219-
echo " LDFLAGS=$LIBMPEG2_LIBS"
220217
fi
221218
if test "$ffmpegok" == "1" ; then
222219
echo " configured with libavcodec Version $LIBAVCODEC_VERSION"
223-
echo " CFLAGS=$FFMPEG_CFLAGS"
224-
echo " LDFLAGS=$FFMPEG_LIBS"
225220
else
226221
echo " ffmpeg-support not configured"
227222
fi

0 commit comments

Comments
 (0)