[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][TOP]
patch for EasyTab-0.17 with libmpeg123.
こんにちは、相花です。
EasyTag <http://easytag.sourceforge.net/> の
最新版 0.17 で libmpeg123 を static にリンクする時に
問題があるのを作者に連絡したらパッチを送ってくれました。
# patch -p1 < patch_easytag_017_libmpeg123_fix.diff
お使いの libtool によっては `configure` する前に
# libtoolize --force
する必要があるかもしれません。
---
(相花)
diff -ruN easytag-0.17/configure easytag-0.17.new/configure
--- easytag-0.17/configure Tue Mar 5 18:01:54 2002
+++ easytag-0.17.new/configure Sun Mar 10 18:52:17 2002
@@ -1300,13 +1300,43 @@
enable_shared=no
fi
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1307: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_RANLIB="ranlib"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+ echo "$ac_t""$RANLIB" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1305: checking for Cygwin environment" >&5
+echo "configure:1335: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1310 "configure"
+#line 1340 "configure"
#include "confdefs.h"
int main() {
@@ -1317,7 +1347,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:1321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -1334,19 +1364,19 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1338: checking for mingw32 environment" >&5
+echo "configure:1368: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1343 "configure"
+#line 1373 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -1363,7 +1393,7 @@
MINGW32=
test "$ac_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1367: checking how to run the C preprocessor" >&5
+echo "configure:1397: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1378,13 +1408,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1382 "configure"
+#line 1412 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1395,13 +1425,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1399 "configure"
+#line 1429 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1412,13 +1442,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1416 "configure"
+#line 1446 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1495,7 +1525,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1499: checking host system type" >&5
+echo "configure:1529: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1516,7 +1546,7 @@
echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1520: checking build system type" >&5
+echo "configure:1550: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1545,7 +1575,7 @@
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1549: checking for ld used by GCC" >&5
+echo "configure:1579: checking for ld used by GCC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -1575,10 +1605,10 @@
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1579: checking for GNU ld" >&5
+echo "configure:1609: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1582: checking for non-GNU ld" >&5
+echo "configure:1612: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1613,7 +1643,7 @@
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1617: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1647: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1630,7 +1660,7 @@
echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1634: checking for $LD option to reload object files" >&5
+echo "configure:1664: checking for $LD option to reload object files" >&5
if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1642,7 +1672,7 @@
test -n "$reload_flag" && reload_flag=" $reload_flag"
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1646: checking for BSD-compatible nm" >&5
+echo "configure:1676: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1680,7 +1710,7 @@
echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1684: checking whether ln -s works" >&5
+echo "configure:1714: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1701,7 +1731,7 @@
fi
echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1705: checking how to recognise dependant libraries" >&5
+echo "configure:1735: checking how to recognise dependant libraries" >&5
if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1874,13 +1904,13 @@
deplibs_check_method=$lt_cv_deplibs_check_method
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1878: checking for object suffix" >&5
+echo "configure:1908: checking for object suffix" >&5
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -1900,7 +1930,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1904: checking for executable suffix" >&5
+echo "configure:1934: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1910,7 +1940,7 @@
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:1944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -1941,7 +1971,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:1945: checking command to parse $NM output" >&5
+echo "configure:1975: checking command to parse $NM output" >&5
if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2017,10 +2047,10 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:2051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo configure:2024: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+ if { (eval echo configure:2054: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -2071,7 +2101,7 @@
save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
- if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ if { (eval echo configure:2105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes
fi
LIBS="$save_LIBS"
@@ -2117,17 +2147,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2121: checking for $ac_hdr" >&5
+echo "configure:2151: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2126 "configure"
+#line 2156 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2162,7 +2192,7 @@
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2166: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2196: checking for ${ac_tool_prefix}file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2224,7 +2254,7 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2228: checking for file" >&5
+echo "configure:2258: checking for file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2295,7 +2325,7 @@
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2299: checking for $ac_word" >&5
+echo "configure:2329: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2327,7 +2357,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2331: checking for $ac_word" >&5
+echo "configure:2361: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2362,7 +2392,7 @@
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2366: checking for $ac_word" >&5
+echo "configure:2396: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2394,7 +2424,7 @@
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2398: checking for $ac_word" >&5
+echo "configure:2428: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2443,8 +2473,8 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 2447 "configure"' > conftest.$ac_ext
- if { (eval echo configure:2448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 2477 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:2478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -32"
@@ -2465,7 +2495,7 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2469: checking whether the C compiler needs -belf" >&5
+echo "configure:2499: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2478,14 +2508,14 @@
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 2482 "configure"
+#line 2512 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_needs_belf=yes
else
@@ -2598,7 +2628,7 @@
compiler="$2"
echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:2602: checking for objdir" >&5
+echo "configure:2632: checking for objdir" >&5
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
@@ -2625,7 +2655,7 @@
# in isolation, and that seeing it set (from the cache) indicates that
# the associated values are set (in the cache) correctly too.
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:2629: checking for $compiler option to produce PIC" >&5
+echo "configure:2659: checking for $compiler option to produce PIC" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2777,21 +2807,21 @@
# Check to make sure the pic_flag actually works.
echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:2781: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo "configure:2811: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 2788 "configure"
+#line 2818 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
case $host_os in
hpux9* | hpux10* | hpux11*)
@@ -2843,7 +2873,7 @@
fi
echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:2847: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "configure:2877: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2851,14 +2881,14 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
cat > conftest.$ac_ext <<EOF
-#line 2855 "configure"
+#line 2885 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_prog_cc_static_works=yes
else
@@ -2885,7 +2915,7 @@
# Check to see if options -o and -c are simultaneously supported by compiler
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:2889: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:2919: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2904,7 +2934,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:2908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:2938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -2933,7 +2963,7 @@
if test x"$compiler_c_o" = x"yes"; then
# Check to see if we can write to a .lo
echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:2937: checking if $compiler supports -c -o file.lo" >&5
+echo "configure:2967: checking if $compiler supports -c -o file.lo" >&5
if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2942,14 +2972,14 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -c -o conftest.lo"
cat > conftest.$ac_ext <<EOF
-#line 2946 "configure"
+#line 2976 "configure"
#include "confdefs.h"
int main() {
int some_variable = 0;
; return 0; }
EOF
-if { (eval echo configure:2953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -2979,7 +3009,7 @@
if test "$compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:2983: checking if we can lock with hard links" >&5
+echo "configure:3013: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -2998,20 +3028,20 @@
if test "$GCC" = yes; then
# Check to see if options -fno-rtti -fno-exceptions are supported by compiler
echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:3002: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:3032: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo "int some_variable = 0;" > conftest.$ac_ext
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
compiler_rtti_exceptions=no
cat > conftest.$ac_ext <<EOF
-#line 3008 "configure"
+#line 3038 "configure"
#include "confdefs.h"
int main() {
int some_variable = 0;
; return 0; }
EOF
-if { (eval echo configure:3015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -3038,7 +3068,7 @@
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:3042: checking whether the linker ($LD) supports shared libraries" >&5
+echo "configure:3072: checking whether the linker ($LD) supports shared libraries" >&5
allow_undefined_flag=
no_undefined_flag=
@@ -3654,7 +3684,7 @@
# Check hardcoding attributes.
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:3658: checking how to hardcode library paths into programs" >&5
+echo "configure:3688: checking how to hardcode library paths into programs" >&5
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var"; then
@@ -3682,7 +3712,7 @@
striplib=
old_striplib=
echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:3686: checking whether stripping libraries is possible" >&5
+echo "configure:3716: checking whether stripping libraries is possible" >&5
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
@@ -3696,7 +3726,7 @@
# PORTME Fill in your ld.so characteristics
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:3700: checking dynamic linker characteristics" >&5
+echo "configure:3730: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4082,7 +4112,7 @@
# Report the final consequences.
echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:4086: checking if libtool supports shared libraries" >&5
+echo "configure:4116: checking if libtool supports shared libraries" >&5
echo "$ac_t""$can_build_shared" 1>&6
if test "$hardcode_action" = relink; then
@@ -4121,7 +4151,7 @@
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4125: checking for dlopen in -ldl" >&5
+echo "configure:4155: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4129,7 +4159,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4133 "configure"
+#line 4163 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4140,7 +4170,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4159,12 +4189,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:4163: checking for dlopen" >&5
+echo "configure:4193: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4168 "configure"
+#line 4198 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -4187,7 +4217,7 @@
; return 0; }
EOF
-if { (eval echo configure:4191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@@ -4205,12 +4235,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:4209: checking for shl_load" >&5
+echo "configure:4239: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4214 "configure"
+#line 4244 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
@@ -4233,7 +4263,7 @@
; return 0; }
EOF
-if { (eval echo configure:4237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@@ -4251,7 +4281,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:4255: checking for dlopen in -lsvld" >&5
+echo "configure:4285: checking for dlopen in -lsvld" >&5
ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4259,7 +4289,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4263 "configure"
+#line 4293 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4270,7 +4300,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4289,7 +4319,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4293: checking for shl_load in -ldld" >&5
+echo "configure:4323: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4297,7 +4327,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4301 "configure"
+#line 4331 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4308,7 +4338,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4361,7 +4391,7 @@
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4365: checking whether a program can dlopen itself" >&5
+echo "configure:4395: checking whether a program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4371,7 +4401,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 4375 "configure"
+#line 4405 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -4432,7 +4462,7 @@
exit (status);
}
EOF
- if { (eval echo configure:4436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:4466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -4455,7 +4485,7 @@
if test "x$lt_cv_dlopen_self" = xyes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4459: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:4489: checking whether a statically linked program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4465,7 +4495,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 4469 "configure"
+#line 4499 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -4526,7 +4556,7 @@
exit (status);
}
EOF
- if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:4560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -4575,14 +4605,14 @@
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:4579: checking whether -lc should be explicitly linked in" >&5
+echo "configure:4609: checking whether -lc should be explicitly linked in" >&5
if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
$rm conftest*
echo 'static int dummy;' > conftest.$ac_ext
- if { (eval echo configure:4586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:4616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -4595,7 +4625,7 @@
libname=conftest
save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo configure:4599: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:4629: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
lt_cv_archive_cmds_need_lc=no
else
@@ -5174,7 +5204,7 @@
echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:5178: checking for strerror in -lcposix" >&5
+echo "configure:5208: checking for strerror in -lcposix" >&5
ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5182,7 +5212,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5186 "configure"
+#line 5216 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5193,7 +5223,7 @@
strerror()
; return 0; }
EOF
-if { (eval echo configure:5197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5277,7 +5307,7 @@
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5281: checking for $ac_word" >&5
+echo "configure:5311: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5312,7 +5342,7 @@
min_gtk_version=1.2.7
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:5316: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:5346: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
@@ -5335,7 +5365,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 5339 "configure"
+#line 5369 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -5413,7 +5443,7 @@
}
EOF
-if { (eval echo configure:5417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -5447,7 +5477,7 @@
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5451 "configure"
+#line 5481 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -5457,7 +5487,7 @@
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; }
EOF
-if { (eval echo configure:5461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -5498,7 +5528,7 @@
if test "x$enable_ogg" = xyes; then
echo $ac_n "checking for ogg_sync_init in -logg""... $ac_c" 1>&6
-echo "configure:5502: checking for ogg_sync_init in -logg" >&5
+echo "configure:5532: checking for ogg_sync_init in -logg" >&5
ac_lib_var=`echo ogg'_'ogg_sync_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5506,7 +5536,7 @@
ac_save_LIBS="$LIBS"
LIBS="-logg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5510 "configure"
+#line 5540 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5517,7 +5547,7 @@
ogg_sync_init()
; return 0; }
EOF
-if { (eval echo configure:5521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5546,7 +5576,7 @@
fi
echo $ac_n "checking for vorbis_comment_init in -lvorbis""... $ac_c" 1>&6
-echo "configure:5550: checking for vorbis_comment_init in -lvorbis" >&5
+echo "configure:5580: checking for vorbis_comment_init in -lvorbis" >&5
ac_lib_var=`echo vorbis'_'vorbis_comment_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5554,7 +5584,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lvorbis $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5558 "configure"
+#line 5588 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5565,7 +5595,7 @@
vorbis_comment_init()
; return 0; }
EOF
-if { (eval echo configure:5569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5594,7 +5624,7 @@
fi
echo $ac_n "checking for ov_open in -lvorbisfile""... $ac_c" 1>&6
-echo "configure:5598: checking for ov_open in -lvorbisfile" >&5
+echo "configure:5628: checking for ov_open in -lvorbisfile" >&5
ac_lib_var=`echo vorbisfile'_'ov_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5602,7 +5632,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lvorbisfile $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5606 "configure"
+#line 5636 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5613,7 +5643,7 @@
ov_open()
; return 0; }
EOF
-if { (eval echo configure:5617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5644,7 +5674,7 @@
fi
echo $ac_n "checking for OGG file support""... $ac_c" 1>&6
-echo "configure:5648: checking for OGG file support" >&5
+echo "configure:5678: checking for OGG file support" >&5
if test "x$enable_ogg" = xyes; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -5660,14 +5690,14 @@
echo $ac_n "checking for library containing ID3Tag_Link""... $ac_c" 1>&6
-echo "configure:5664: checking for library containing ID3Tag_Link" >&5
+echo "configure:5694: checking for library containing ID3Tag_Link" >&5
if eval "test \"`echo '$''{'ac_cv_search_ID3Tag_Link'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_func_search_save_LIBS="$LIBS"
ac_cv_search_ID3Tag_Link="no"
cat > conftest.$ac_ext <<EOF
-#line 5671 "configure"
+#line 5701 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5678,7 +5708,7 @@
ID3Tag_Link()
; return 0; }
EOF
-if { (eval echo configure:5682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_ID3Tag_Link="none required"
else
@@ -5689,7 +5719,7 @@
test "$ac_cv_search_ID3Tag_Link" = "no" && for i in "id3" "id3 -lstdc++" "id3 -lz" "id3 -lz -lstdc++"; do
LIBS="-l$i $ac_func_search_save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5693 "configure"
+#line 5723 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5700,7 +5730,7 @@
ID3Tag_Link()
; return 0; }
EOF
-if { (eval echo configure:5704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_search_ID3Tag_Link="-l$i"
break
@@ -5727,12 +5757,12 @@
ID3LIB_PATCH=13
echo $ac_n "checking for id3lib version""... $ac_c" 1>&6
-echo "configure:5731: checking for id3lib version" >&5
+echo "configure:5761: checking for id3lib version" >&5
if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 5736 "configure"
+#line 5766 "configure"
#include "confdefs.h"
#include <id3.h>
@@ -5748,7 +5778,7 @@
}
EOF
-if { (eval echo configure:5752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
. conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
else
@@ -5787,12 +5817,12 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:5791: checking for $ac_hdr that defines DIR" >&5
+echo "configure:5821: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5796 "configure"
+#line 5826 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -5800,7 +5830,7 @@
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:5804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -5825,7 +5855,7 @@
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:5829: checking for opendir in -ldir" >&5
+echo "configure:5859: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5833,7 +5863,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5837 "configure"
+#line 5867 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5844,7 +5874,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5866,7 +5896,7 @@
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:5870: checking for opendir in -lx" >&5
+echo "configure:5900: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5874,7 +5904,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5878 "configure"
+#line 5908 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5885,7 +5915,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:5889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5908,12 +5938,12 @@
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:5912: checking for ANSI C header files" >&5
+echo "configure:5942: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5917 "configure"
+#line 5947 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -5921,7 +5951,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5938,7 +5968,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 5942 "configure"
+#line 5972 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -5956,7 +5986,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 5960 "configure"
+#line 5990 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -5977,7 +6007,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 5981 "configure"
+#line 6011 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -5988,7 +6018,7 @@
exit (0); }
EOF
-if { (eval echo configure:5992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -6015,17 +6045,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6019: checking for $ac_hdr" >&5
+echo "configure:6049: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6024 "configure"
+#line 6054 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6055,12 +6085,12 @@
for ac_func in iconv_open
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6059: checking for $ac_func" >&5
+echo "configure:6089: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6064 "configure"
+#line 6094 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6083,7 +6113,7 @@
; return 0; }
EOF
-if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -6110,12 +6140,12 @@
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6114: checking for working const" >&5
+echo "configure:6144: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6119 "configure"
+#line 6149 "configure"
#include "confdefs.h"
int main() {
@@ -6164,7 +6194,7 @@
; return 0; }
EOF
-if { (eval echo configure:6168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -6185,12 +6215,12 @@
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6189: checking for mode_t" >&5
+echo "configure:6219: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6194 "configure"
+#line 6224 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6218,12 +6248,12 @@
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6222: checking for pid_t" >&5
+echo "configure:6252: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6227 "configure"
+#line 6257 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6251,12 +6281,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:6255: checking for size_t" >&5
+echo "configure:6285: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6260 "configure"
+#line 6290 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6284,12 +6314,12 @@
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:6288: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:6318: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6293 "configure"
+#line 6323 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -6297,7 +6327,7 @@
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:6301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -6321,12 +6351,12 @@
for ac_func in mkdir strstr strtol
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6325: checking for $ac_func" >&5
+echo "configure:6355: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6330 "configure"
+#line 6360 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -6349,7 +6379,7 @@
; return 0; }
EOF
-if { (eval echo configure:6353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -6374,36 +6404,6 @@
done
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6381: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
echo $ac_n "checking for inline""... $ac_c" 1>&6
echo "configure:6409: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
@@ -8064,6 +8064,7 @@
s%@MAKEINFO@%$MAKEINFO%g
s%@SET_MAKE@%$SET_MAKE%g
s%@CC@%$CC%g
+s%@RANLIB@%$RANLIB%g
s%@host@%$host%g
s%@host_alias@%$host_alias%g
s%@host_cpu@%$host_cpu%g
@@ -8078,7 +8079,6 @@
s%@OBJEXT@%$OBJEXT%g
s%@EXEEXT@%$EXEEXT%g
s%@ECHO@%$ECHO%g
-s%@RANLIB@%$RANLIB%g
s%@STRIP@%$STRIP%g
s%@CPP@%$CPP%g
s%@LIBTOOL@%$LIBTOOL%g
diff -ruN easytag-0.17/configure.in easytag-0.17.new/configure.in
--- easytag-0.17/configure.in Tue Mar 5 18:01:26 2002
+++ easytag-0.17.new/configure.in Sun Mar 10 18:52:11 2002
@@ -23,6 +23,7 @@
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_DISABLE_SHARED
+AC_PROG_RANLIB
AC_PROG_LIBTOOL
AC_ISC_POSIX
diff -ruN easytag-0.17/src/Makefile.am easytag-0.17.new/src/Makefile.am
--- easytag-0.17/src/Makefile.am Sun Feb 10 12:22:50 2002
+++ easytag-0.17.new/src/Makefile.am Sun Mar 10 18:33:53 2002
@@ -40,7 +40,7 @@
mylocale.h
-easytag_LDADD = $(GTK_LIBS) mpg123/libmpg123.la
+easytag_LDADD = $(GTK_LIBS) mpg123/libmpg123.a
localedir = $(datadir)/locale
PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
diff -ruN easytag-0.17/src/Makefile.in easytag-0.17.new/src/Makefile.in
--- easytag-0.17/src/Makefile.in Tue Mar 5 18:04:16 2002
+++ easytag-0.17.new/src/Makefile.in Sun Mar 10 18:52:36 2002
@@ -138,7 +138,7 @@
mylocale.h
-easytag_LDADD = $(GTK_LIBS) mpg123/libmpg123.la
+easytag_LDADD = $(GTK_LIBS) mpg123/libmpg123.a
localedir = $(datadir)/locale
PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
@@ -158,7 +158,7 @@
charset.$(OBJEXT) easytag.$(OBJEXT) et_core.$(OBJEXT) id3tag.$(OBJEXT) \
misc.$(OBJEXT) mpeg_header.$(OBJEXT) msgbox.$(OBJEXT) ogg_tag.$(OBJEXT) \
prefs.$(OBJEXT) scan.$(OBJEXT) setting.$(OBJEXT) vcedit.$(OBJEXT)
-easytag_DEPENDENCIES = mpg123/libmpg123.la
+easytag_DEPENDENCIES = mpg123/libmpg123.a
easytag_LDFLAGS =
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -372,74 +372,6 @@
|| exit 1; \
fi; \
done
-about.o: about.c about.h easytag.h ../config.h misc.h msgbox.h \
- mylocale.h
-bar.o: bar.c bar.h easytag.h ../config.h about.h prefs.h setting.h \
- browser.h et_core.h scan.h misc.h mylocale.h \
- ../pixmaps/first.xpm ../pixmaps/previous.xpm \
- ../pixmaps/next.xpm ../pixmaps/last.xpm ../pixmaps/scan.xpm \
- ../pixmaps/scan_all.xpm ../pixmaps/delete.xpm \
- ../pixmaps/delete_all.xpm ../pixmaps/undo.xpm \
- ../pixmaps/undo_all.xpm ../pixmaps/redo.xpm \
- ../pixmaps/redo_all.xpm ../pixmaps/save.xpm \
- ../pixmaps/save_all.xpm ../pixmaps/stop.xpm ../pixmaps/exit.xpm
-browser.o: browser.c easytag.h ../config.h browser.h et_core.h msgbox.h \
- bar.h misc.h setting.h mylocale.h ../pixmaps/opened_folder.xpm \
- ../pixmaps/closed_folder.xpm \
- ../pixmaps/closed_folder_locked.xpm
-charset.o: charset.c ../config.h charset.h setting.h mylocale.h
-common.o: common.c mpg123.h dxhead.h
-dxhead.o: dxhead.c dxhead.h
-easytag.o: easytag.c easytag.h ../config.h browser.h et_core.h misc.h \
- bar.h prefs.h setting.h scan.h mpeg_header.h id3tag.h msgbox.h \
- mylocale.h ../pixmaps/EasyTAG.xpm ../pixmaps/read_only.xpm \
- ../pixmaps/broken.xpm ../pixmaps/sequence_track.xpm \
- ../pixmaps/go.xpm ../pixmaps/next.xpm ../pixmaps/previous.xpm \
- ../pixmaps/scan.xpm ../pixmaps/scan_all.xpm \
- ../pixmaps/delete.xpm ../pixmaps/delete_all.xpm \
- ../pixmaps/undo.xpm ../pixmaps/undo_all.xpm ../pixmaps/redo.xpm \
- ../pixmaps/redo_all.xpm ../pixmaps/save.xpm \
- ../pixmaps/save_all.xpm ../pixmaps/exit.xpm ../pixmaps/stop.xpm
-et_core.o: et_core.c easytag.h ../config.h et_core.h mpeg_header.h \
- id3tag.h bar.h browser.h misc.h setting.h mylocale.h
-getbits.o: getbits.c mpg123.h dxhead.h
-id3tag.o: id3tag.c id3tag.h et_core.h genres.h easytag.h ../config.h \
- browser.h setting.h misc.h charset.h mylocale.h
-layer1.o: layer1.c mpg123.h dxhead.h getbits.h
-layer2.o: layer2.c mpg123.h dxhead.h l2tables.h getbits.h
-layer3.o: layer3.c mpg123.h dxhead.h huffman.h getbits.h
-misc.o: misc.c misc.h easytag.h ../config.h msgbox.h id3tag.h et_core.h \
- browser.h setting.h bar.h genres.h mylocale.h ../pixmaps/ok.xpm \
- ../pixmaps/yes.xpm ../pixmaps/no.xpm ../pixmaps/apply.xpm \
- ../pixmaps/save.xpm ../pixmaps/cancel.xpm ../pixmaps/close.xpm
-mpeg_header.o: mpeg_header.c mpeg_header.h et_core.h easytag.h \
- ../config.h misc.h mylocale.h mpg123/mpg123.h mpg123/dxhead.h
-mpg123.o: mpg123.c mpg123.h dxhead.h
-msgbox.o: msgbox.c msgbox.h easytag.h ../config.h misc.h setting.h \
- mylocale.h ../pixmaps/msg-error.xpm ../pixmaps/msg-info.xpm \
- ../pixmaps/msg-question.xpm ../pixmaps/msg-warning.xpm
-ogg_tag.o: ogg_tag.c ../config.h
-prefs.o: prefs.c prefs.h setting.h msgbox.h bar.h misc.h scan.h \
- et_core.h easytag.h ../config.h browser.h charset.h mylocale.h \
- ../pixmaps/grab.xpm ../pixmaps/spinner.xpm ../pixmaps/go.xpm \
- ../pixmaps/first.xpm ../pixmaps/previous.xpm \
- ../pixmaps/next.xpm ../pixmaps/last.xpm ../pixmaps/scan.xpm \
- ../pixmaps/scan_all.xpm ../pixmaps/delete.xpm \
- ../pixmaps/delete_all.xpm ../pixmaps/undo.xpm \
- ../pixmaps/undo_all.xpm ../pixmaps/redo.xpm \
- ../pixmaps/redo_all.xpm ../pixmaps/save.xpm \
- ../pixmaps/save_all.xpm ../pixmaps/exit.xpm
-scan.o: scan.c scan.h et_core.h easytag.h ../config.h prefs.h setting.h \
- id3tag.h bar.h misc.h mylocale.h ../pixmaps/scan.xpm \
- ../pixmaps/scan_all.xpm ../pixmaps/help.xpm ../pixmaps/exit.xpm \
- ../pixmaps/setting.xpm ../pixmaps/mask.xpm ../pixmaps/save.xpm \
- ../pixmaps/up.xpm ../pixmaps/down.xpm ../pixmaps/new.xpm \
- ../pixmaps/copy.xpm ../pixmaps/trash.xpm ../pixmaps/add.xpm \
- ../pixmaps/blackwhite.xpm ../pixmaps/forbidden.xpm
-setting.o: setting.c setting.h prefs.h bar.h easytag.h ../config.h \
- charset.h scan.h et_core.h misc.h mylocale.h
-test.o: test.c test.h dxhead.h
-vcedit.o: vcedit.c ../config.h
info-am:
info: info-recursive
diff -ruN easytag-0.17/src/mpg123/Makefile.am easytag-0.17.new/src/mpg123/Makefile.am
--- easytag-0.17/src/mpg123/Makefile.am Tue Feb 12 21:18:48 2002
+++ easytag-0.17.new/src/mpg123/Makefile.am Sun Mar 10 18:44:57 2002
@@ -1,11 +1,11 @@
CFLAGS = @CFLAGS@ @GTK_CFLAGS@
-noinst_LTLIBRARIES = libmpg123.la
+noinst_LIBRARIES = libmpg123.a
INCLUDES = -DLOCALE=\"$(localedir)\"
-libmpg123_la_SOURCES = \
+libmpg123_a_SOURCES = \
common.c \
dxhead.h \
dxhead.c \
@@ -19,8 +19,6 @@
mpg123.c \
mpg123.h
-libmpg123_la_LIBADD = $(GTK_LIBS)
-
EXTRA_DIST = \
README
diff -ruN easytag-0.17/src/mpg123/Makefile.in easytag-0.17.new/src/mpg123/Makefile.in
--- easytag-0.17/src/mpg123/Makefile.in Tue Mar 5 18:04:16 2002
+++ easytag-0.17.new/src/mpg123/Makefile.in Sun Mar 10 18:52:37 2002
@@ -99,11 +99,11 @@
CFLAGS = @CFLAGS@ @GTK_CFLAGS@
-noinst_LTLIBRARIES = libmpg123.la
+noinst_LIBRARIES = libmpg123.a
INCLUDES = -DLOCALE=\"$(localedir)\"
-libmpg123_la_SOURCES = \
+libmpg123_a_SOURCES = \
common.c \
dxhead.h \
dxhead.c \
@@ -118,25 +118,24 @@
mpg123.h
-libmpg123_la_LIBADD = $(GTK_LIBS)
-
EXTRA_DIST = \
README
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+LIBRARIES = $(noinst_LIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-libmpg123_la_LDFLAGS =
-libmpg123_la_DEPENDENCIES =
-libmpg123_la_OBJECTS = common.lo dxhead.lo getbits.lo layer1.lo \
-layer2.lo layer3.lo mpg123.lo
+libmpg123_a_LIBADD =
+libmpg123_a_OBJECTS = common.$(OBJEXT) dxhead.$(OBJEXT) \
+getbits.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \
+mpg123.$(OBJEXT)
+AR = ar
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
@@ -148,8 +147,8 @@
TAR = gtar
GZIP_ENV = --best
-SOURCES = $(libmpg123_la_SOURCES)
-OBJECTS = $(libmpg123_la_OBJECTS)
+SOURCES = $(libmpg123_a_SOURCES)
+OBJECTS = $(libmpg123_a_OBJECTS)
all: all-redirect
.SUFFIXES:
@@ -162,14 +161,14 @@
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-mostlyclean-noinstLTLIBRARIES:
+mostlyclean-noinstLIBRARIES:
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-distclean-noinstLTLIBRARIES:
+distclean-noinstLIBRARIES:
-maintainer-clean-noinstLTLIBRARIES:
+maintainer-clean-noinstLIBRARIES:
.c.o:
$(COMPILE) -c $<
@@ -215,8 +214,10 @@
maintainer-clean-libtool:
-libmpg123.la: $(libmpg123_la_OBJECTS) $(libmpg123_la_DEPENDENCIES)
- $(LINK) $(libmpg123_la_LDFLAGS) $(libmpg123_la_OBJECTS) $(libmpg123_la_LIBADD) $(LIBS)
+libmpg123.a: $(libmpg123_a_OBJECTS) $(libmpg123_a_DEPENDENCIES)
+ -rm -f libmpg123.a
+ $(AR) cru libmpg123.a $(libmpg123_a_OBJECTS) $(libmpg123_a_LIBADD)
+ $(RANLIB) libmpg123.a
tags: TAGS
@@ -262,13 +263,6 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-common.lo common.o : common.c mpg123.h dxhead.h
-dxhead.lo dxhead.o : dxhead.c dxhead.h
-getbits.lo getbits.o : getbits.c mpg123.h dxhead.h
-layer1.lo layer1.o : layer1.c mpg123.h dxhead.h getbits.h
-layer2.lo layer2.o : layer2.c mpg123.h dxhead.h l2tables.h getbits.h
-layer3.lo layer3.o : layer3.c mpg123.h dxhead.h huffman.h getbits.h
-mpg123.lo mpg123.o : mpg123.c mpg123.h dxhead.h
info-am:
info: info-am
@@ -289,7 +283,7 @@
install: install-am
uninstall-am:
uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LIBRARIES)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -305,25 +299,25 @@
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-tags \
mostlyclean-generic
mostlyclean: mostlyclean-am
-clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \
- clean-tags clean-generic mostlyclean-am
+clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
+ clean-generic mostlyclean-am
clean: clean-am
-distclean-am: distclean-noinstLTLIBRARIES distclean-compile \
+distclean-am: distclean-noinstLIBRARIES distclean-compile \
distclean-libtool distclean-tags distclean-generic \
clean-am
-rm -f libtool
distclean: distclean-am
-maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \
+maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-generic \
distclean-am
@@ -332,8 +326,8 @@
maintainer-clean: maintainer-clean-am
-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \