[Easyh10-cvs] easyh10 Makefile.in, 1.39, 1.40 config.h.in, 1.11, 1.12 configure, 1.29, 1.30 configu
Status: Beta
Brought to you by:
nyaochi
Menu
▾
▴
[Easyh10-cvs] easyh10 Makefile.in, 1.39, 1.40 config.h.in, 1.11, 1.12 configure, 1.29, 1.30 configure.in, 1.36, 1.37
|
From: Nyaochi <ny...@us...> - 2006-10-08 08:32:43
|
Update of /cvsroot/easyh10/easyh10 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28441 Modified Files: Makefile.in config.h.in configure configure.in Log Message: Return to libid3tag for the better compatibility with non ISO-8859-1 tags. Index: config.h.in =================================================================== RCS file: /cvsroot/easyh10/easyh10/config.h.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config.h.in 6 Sep 2006 04:26:15 -0000 1.11 --- config.h.in 8 Oct 2006 08:32:37 -0000 1.12 *************** *** 97,107 **** #undef HAVE_SYS_TYPES_H - /* Have TagLib */ - #undef HAVE_TAGLIB - /* add uint16_t type */ #undef HAVE_UINT16_T #ifndef HAVE_UINT16_T ! typedef unsigned short uint16_t; #endif --- 97,104 ---- #undef HAVE_SYS_TYPES_H /* add uint16_t type */ #undef HAVE_UINT16_T #ifndef HAVE_UINT16_T ! typedef unsigned short uint16_t; #endif *************** *** 110,114 **** #ifndef HAVE_UINT32_T #undef A_UINT32_T ! typedef A_UINT32_T uint32_t; #endif --- 107,111 ---- #ifndef HAVE_UINT32_T #undef A_UINT32_T ! typedef A_UINT32_T uint32_t; #endif *************** *** 116,120 **** #undef HAVE_UINT8_T #ifndef HAVE_UINT8_T ! typedef unsigned char uint8_t; #endif --- 113,117 ---- #undef HAVE_UINT8_T #ifndef HAVE_UINT8_T ! typedef unsigned char uint8_t; #endif Index: configure =================================================================== RCS file: /cvsroot/easyh10/easyh10/configure,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** configure 6 Sep 2006 04:26:15 -0000 1.29 --- configure 8 Oct 2006 08:32:37 -0000 1.30 *************** *** 464,468 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT U ANSI2KNR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA LIBOBJS TAGLIB_CONFIG INCLUDES ICONV_LIBS REGEX_LIBS LTLIBOBJS' ac_subst_files='' --- 464,468 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT U ANSI2KNR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA LIBOBJS INCLUDES ID3TAG_LIBS ICONV_LIBS REGEX_LIBS LTLIBOBJS' ac_subst_files='' *************** *** 1049,1052 **** --- 1049,1056 ---- --with-iconv-library=DIR iconv library directory + --with-id3tag-header=DIR + id3tag header directory + --with-id3tag-library=DIR + id3tag library directory Some influential environment variables: *************** *** 6159,6163 **** *-*-irix6*) # Find out which ABI we are using. ! echo '#line 6161 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 --- 6163,6167 ---- *-*-irix6*) # Find out which ABI we are using. ! echo '#line 6165 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 *************** *** 7252,7256 **** # Provide some information about the compiler. ! echo "$as_me:7254:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` --- 7256,7260 ---- # Provide some information about the compiler. ! echo "$as_me:7258:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` *************** *** 8284,8292 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:8286: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:8290: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 8288,8296 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:8290: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:8294: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 8517,8525 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:8519: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:8523: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 8521,8529 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:8523: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:8527: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 8577,8585 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:8579: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:8583: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 8581,8589 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:8583: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:8587: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 10765,10769 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 10767 "configure" #include "confdefs.h" --- 10769,10773 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 10771 "configure" #include "confdefs.h" *************** *** 10863,10867 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 10865 "configure" #include "confdefs.h" --- 10867,10871 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 10869 "configure" #include "confdefs.h" *************** *** 13040,13048 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13042: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:13046: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 13044,13052 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13046: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:13050: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 13100,13108 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13102: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:13106: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 13104,13112 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13106: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:13110: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 14469,14473 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 14471 "configure" #include "confdefs.h" --- 14473,14477 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 14475 "configure" #include "confdefs.h" *************** *** 14567,14571 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 14569 "configure" #include "confdefs.h" --- 14571,14575 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 14573 "configure" #include "confdefs.h" *************** *** 15394,15402 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15396: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:15400: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 15398,15406 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15400: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:15404: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 15454,15462 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15456: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:15460: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 15458,15466 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:15460: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:15464: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 17499,17507 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:17501: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:17505: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 17503,17511 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:17505: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:17509: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 17732,17740 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:17734: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:17738: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 17736,17744 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:17738: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:17742: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 17792,17800 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:17794: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:17798: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 17796,17804 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:17798: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:17802: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 19980,19984 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 19982 "configure" #include "confdefs.h" --- 19984,19988 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 19986 "configure" #include "confdefs.h" *************** *** 20078,20082 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 20080 "configure" #include "confdefs.h" --- 20082,20086 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 20084 "configure" #include "confdefs.h" *************** *** 21094,21098 **** CFLAGS="${ac_save_CFLAGS}" - CPPFLAGS="${ac_save_CPPFLAGS}" LDFLAGS="${ac_save_LDFLAGS}" INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)" --- 21098,21101 ---- *************** *** 24696,24721 **** if test "${ac_cv_sizeof_unsigned_short}" = "4"; then ! cat >>confdefs.h <<\_ACEOF #define A_UINT32_T unsigned short _ACEOF else ! if test "${ac_cv_sizeof_unsigned_int}" = "4"; then ! cat >>confdefs.h <<\_ACEOF #define A_UINT32_T unsigned int _ACEOF ! else ! if test "${ac_cv_sizeof_unsigned_long}" = "4"; then ! cat >>confdefs.h <<\_ACEOF #define A_UINT32_T unsigned long _ACEOF ! else ! { { echo "$as_me:$LINENO: error: CHECK_TYPE_uint32_t - please report to the developper" >&5 echo "$as_me: error: CHECK_TYPE_uint32_t - please report to the developper" >&2;} { (exit 1); exit 1; }; } ! fi ! fi fi --- 24699,24724 ---- if test "${ac_cv_sizeof_unsigned_short}" = "4"; then ! cat >>confdefs.h <<\_ACEOF #define A_UINT32_T unsigned short _ACEOF else ! if test "${ac_cv_sizeof_unsigned_int}" = "4"; then ! cat >>confdefs.h <<\_ACEOF #define A_UINT32_T unsigned int _ACEOF ! else ! if test "${ac_cv_sizeof_unsigned_long}" = "4"; then ! cat >>confdefs.h <<\_ACEOF #define A_UINT32_T unsigned long _ACEOF ! else ! { { echo "$as_me:$LINENO: error: CHECK_TYPE_uint32_t - please report to the developper" >&5 echo "$as_me: error: CHECK_TYPE_uint32_t - please report to the developper" >&2;} { (exit 1); exit 1; }; } ! fi ! fi fi *************** *** 26339,26343 **** if test x$with_libiconv != xno ; then case " $INTLLIBS " in ! *[\ \ ]-liconv[\ \ ]*) ;; *) ICONV_LIBS="-liconv" ;; esac --- 26342,26346 ---- if test x$with_libiconv != xno ; then case " $INTLLIBS " in ! *[\ \ ]-liconv[\ \ ]*) ;; *) ICONV_LIBS="-liconv" ;; esac *************** *** 26362,26418 **** ! # Extract the first word of "taglib-config", so it can be a program name with args. ! set dummy taglib-config; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_TAGLIB_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case $TAGLIB_CONFIG in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_TAGLIB_CONFIG="$TAGLIB_CONFIG" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_TAGLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 fi ! done ! done ! test -z "$ac_cv_path_TAGLIB_CONFIG" && ac_cv_path_TAGLIB_CONFIG="no" ! ;; esac fi ! TAGLIB_CONFIG=$ac_cv_path_TAGLIB_CONFIG ! if test -n "$TAGLIB_CONFIG"; then ! echo "$as_me:$LINENO: result: $TAGLIB_CONFIG" >&5 ! echo "${ECHO_T}$TAGLIB_CONFIG" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi ! if test "x$TAGLIB_CONFIG" = "xno" ; then ! { { echo "$as_me:$LINENO: error: *** No TagLib (taglib-config) found" >&5 ! echo "$as_me: error: *** No TagLib (taglib-config) found" >&2;} { (exit 1); exit 1; }; } else ! cat >>confdefs.h <<\_ACEOF ! #define HAVE_TAGLIB 1 _ACEOF - CPPFLAGS="`$TAGLIB_CONFIG --cflags` ${CPPFLAGS}" - LDFLAGS="`$TAGLIB_CONFIG --libs` ${LDFLAGS}" fi --- 26365,26668 ---- ! ! # Check whether --with-id3tag-header or --without-id3tag-header was given. ! if test "${with_id3tag_header+set}" = set; then ! withval="$with_id3tag_header" ! CFLAGS="-I$withval ${CFLAGS}" ! ! fi; ! ! ! # Check whether --with-id3tag-library or --without-id3tag-library was given. ! if test "${with_id3tag_library+set}" = set; then ! withval="$with_id3tag_library" ! LDFLAGS="-L$withval ${LDFLAGS}" ! ! fi; ! ! if test "${ac_cv_header_id3tag_h+set}" = set; then ! echo "$as_me:$LINENO: checking for id3tag.h" >&5 ! echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6 ! if test "${ac_cv_header_id3tag_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5 + echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6 else ! # Is the header compilable? ! echo "$as_me:$LINENO: checking id3tag.h usability" >&5 ! echo $ECHO_N "checking id3tag.h usability... $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. */ ! $ac_includes_default ! #include <id3tag.h> ! _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_header_compiler=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_header_compiler=no ! fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ! echo "${ECHO_T}$ac_header_compiler" >&6 ! ! # Is the header present? ! echo "$as_me:$LINENO: checking id3tag.h presence" >&5 ! echo $ECHO_N "checking id3tag.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 <id3tag.h> ! _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ! else ! ac_cpp_err= fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ! ac_header_preproc=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no ! fi ! rm -f conftest.err conftest.$ac_ext ! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ! echo "${ECHO_T}$ac_header_preproc" >&6 ! ! # 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: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&5 ! echo "$as_me: WARNING: id3tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ! { echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the compiler's result" >&5 ! echo "$as_me: WARNING: id3tag.h: proceeding with the compiler's result" >&2;} ! ac_header_preproc=yes ! ;; ! no:yes:* ) ! { echo "$as_me:$LINENO: WARNING: id3tag.h: present but cannot be compiled" >&5 ! echo "$as_me: WARNING: id3tag.h: present but cannot be compiled" >&2;} ! { echo "$as_me:$LINENO: WARNING: id3tag.h: check for missing prerequisite headers?" >&5 ! echo "$as_me: WARNING: id3tag.h: check for missing prerequisite headers?" >&2;} ! { echo "$as_me:$LINENO: WARNING: id3tag.h: see the Autoconf documentation" >&5 ! echo "$as_me: WARNING: id3tag.h: see the Autoconf documentation" >&2;} ! { echo "$as_me:$LINENO: WARNING: id3tag.h: section \"Present But Cannot Be Compiled\"" >&5 ! echo "$as_me: WARNING: id3tag.h: section \"Present But Cannot Be Compiled\"" >&2;} ! { echo "$as_me:$LINENO: WARNING: id3tag.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: id3tag.h: proceeding with the preprocessor's result" >&2;} ! { echo "$as_me:$LINENO: WARNING: id3tag.h: in the future, the compiler will take precedence" >&5 ! echo "$as_me: WARNING: id3tag.h: in the future, the compiler will take precedence" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------------ ## ! ## Report this to the AC_PACKAGE_NAME lists. ## ! ## ------------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac + echo "$as_me:$LINENO: checking for id3tag.h" >&5 + echo $ECHO_N "checking for id3tag.h... $ECHO_C" >&6 + if test "${ac_cv_header_id3tag_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_id3tag_h=$ac_header_preproc fi ! echo "$as_me:$LINENO: result: $ac_cv_header_id3tag_h" >&5 ! echo "${ECHO_T}$ac_cv_header_id3tag_h" >&6 ! fi ! if test $ac_cv_header_id3tag_h = yes; then ! : else ! { { echo "$as_me:$LINENO: error: id3tag header not found!" >&5 ! echo "$as_me: error: id3tag header not found!" >&2;} ! { (exit 1); exit 1; }; } ! fi ! echo "$as_me:$LINENO: checking for id3_file_fdopen in -lid3tag" >&5 ! echo $ECHO_N "checking for id3_file_fdopen in -lid3tag... $ECHO_C" >&6 ! if test "${ac_cv_lib_id3tag_id3_file_fdopen+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lid3tag $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char id3_file_fdopen (); ! int ! main () ! { ! id3_file_fdopen (); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_lib_id3tag_id3_file_fdopen=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_cv_lib_id3tag_id3_file_fdopen=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_id3tag_id3_file_fdopen" >&5 ! echo "${ECHO_T}$ac_cv_lib_id3tag_id3_file_fdopen" >&6 ! if test $ac_cv_lib_id3tag_id3_file_fdopen = yes; then ! ID3TAG_LIBS="-lid3tag" ! else ! { { echo "$as_me:$LINENO: error: id3tag library is not found!" >&5 ! echo "$as_me: error: id3tag library is not found!" >&2;} { (exit 1); exit 1; }; } + + fi + + echo "$as_me:$LINENO: checking for id3_file_gettag in -lid3tag" >&5 + echo $ECHO_N "checking for id3_file_gettag in -lid3tag... $ECHO_C" >&6 + if test "${ac_cv_lib_id3tag_id3_file_gettag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lid3tag $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char id3_file_gettag (); ! int ! main () ! { ! id3_file_gettag (); ! ; ! return 0; ! } _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_id3tag_id3_file_gettag=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_id3tag_id3_file_gettag=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_id3tag_id3_file_gettag" >&5 + echo "${ECHO_T}$ac_cv_lib_id3tag_id3_file_gettag" >&6 + if test $ac_cv_lib_id3tag_id3_file_gettag = yes; then + CFLAGS="-DHAVE_LIBID3TAG_GETTAG ${CFLAGS}" fi *************** *** 27502,27507 **** s,@ALLOCA@,$ALLOCA,;t t s,@LIBOBJS@,$LIBOBJS,;t t - s,@TAGLIB_CONFIG@,$TAGLIB_CONFIG,;t t s,@INCLUDES@,$INCLUDES,;t t s,@ICONV_LIBS@,$ICONV_LIBS,;t t s,@REGEX_LIBS@,$REGEX_LIBS,;t t --- 27752,27757 ---- s,@ALLOCA@,$ALLOCA,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@INCLUDES@,$INCLUDES,;t t + s,@ID3TAG_LIBS@,$ID3TAG_LIBS,;t t s,@ICONV_LIBS@,$ICONV_LIBS,;t t s,@REGEX_LIBS@,$REGEX_LIBS,;t t Index: configure.in =================================================================== RCS file: /cvsroot/easyh10/easyh10/configure.in,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** configure.in 6 Sep 2006 04:26:15 -0000 1.36 --- configure.in 8 Oct 2006 08:32:38 -0000 1.37 *************** *** 37,41 **** dnl Initialization for variables CFLAGS="${ac_save_CFLAGS}" - CPPFLAGS="${ac_save_CPPFLAGS}" LDFLAGS="${ac_save_LDFLAGS}" INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)" --- 37,40 ---- *************** *** 67,71 **** #undef HAVE_UINT8_T #ifndef HAVE_UINT8_T ! typedef unsigned char uint8_t; #endif]) --- 66,70 ---- #undef HAVE_UINT8_T #ifndef HAVE_UINT8_T ! typedef unsigned char uint8_t; #endif]) *************** *** 74,92 **** #undef HAVE_UINT16_T #ifndef HAVE_UINT16_T ! typedef unsigned short uint16_t; #endif]) if test "${ac_cv_sizeof_unsigned_short}" = "4"; then ! AC_DEFINE(A_UINT32_T,unsigned short) else ! if test "${ac_cv_sizeof_unsigned_int}" = "4"; then ! AC_DEFINE(A_UINT32_T,unsigned int) ! else ! if test "${ac_cv_sizeof_unsigned_long}" = "4"; then ! AC_DEFINE(A_UINT32_T,unsigned long) ! else ! AC_MSG_ERROR([CHECK_TYPE_uint32_t - please report to the developper]) ! fi ! fi fi --- 73,91 ---- #undef HAVE_UINT16_T #ifndef HAVE_UINT16_T ! typedef unsigned short uint16_t; #endif]) if test "${ac_cv_sizeof_unsigned_short}" = "4"; then ! AC_DEFINE(A_UINT32_T,unsigned short) else ! if test "${ac_cv_sizeof_unsigned_int}" = "4"; then ! AC_DEFINE(A_UINT32_T,unsigned int) ! else ! if test "${ac_cv_sizeof_unsigned_long}" = "4"; then ! AC_DEFINE(A_UINT32_T,unsigned long) ! else ! AC_MSG_ERROR([CHECK_TYPE_uint32_t - please report to the developper]) ! fi ! fi fi *************** *** 96,100 **** #ifndef HAVE_UINT32_T #undef A_UINT32_T ! typedef A_UINT32_T uint32_t; #endif]) --- 95,99 ---- #ifndef HAVE_UINT32_T #undef A_UINT32_T ! typedef A_UINT32_T uint32_t; #endif]) *************** *** 168,172 **** if test x$with_libiconv != xno ; then case " $INTLLIBS " in ! *[[\ \ ]]-liconv[[\ \ ]]*) ;; *) ICONV_LIBS="-liconv" ;; esac --- 167,171 ---- if test x$with_libiconv != xno ; then case " $INTLLIBS " in ! *[[\ \ ]]-liconv[[\ \ ]]*) ;; *) ICONV_LIBS="-liconv" ;; esac *************** *** 183,197 **** ! dnl Check for TagLib ! AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, no) ! if test "x$TAGLIB_CONFIG" = "xno" ; then ! AC_MSG_ERROR([*** No TagLib (taglib-config) found]) ! else ! AC_DEFINE(HAVE_TAGLIB, 1, [Have TagLib]) ! CPPFLAGS="`$TAGLIB_CONFIG --cflags` ${CPPFLAGS}" ! LDFLAGS="`$TAGLIB_CONFIG --libs` ${LDFLAGS}" ! fi dnl Check for POSIX regex implementation --- 182,214 ---- ! dnl Checks for id3tag ! AC_ARG_WITH( ! id3tag-header, ! [AC_HELP_STRING(--with-id3tag-header=DIR, [id3tag header directory])], ! [CFLAGS="-I$withval ${CFLAGS}"] ! ) ! AC_ARG_WITH( ! id3tag-library, ! [AC_HELP_STRING(--with-id3tag-library=DIR, [id3tag library directory])], ! [LDFLAGS="-L$withval ${LDFLAGS}"] ! ) + AC_CHECK_HEADER( + id3tag.h, + , + [AC_MSG_ERROR(id3tag header not found!)] + ) + AC_CHECK_LIB( + id3tag, + id3_file_fdopen, + [ID3TAG_LIBS="-lid3tag"], + AC_MSG_ERROR([id3tag library is not found!]) + ) + AC_CHECK_LIB( + id3tag, + id3_file_gettag, + [CFLAGS="-DHAVE_LIBID3TAG_GETTAG ${CFLAGS}"] + ) dnl Check for POSIX regex implementation *************** *** 231,237 **** dnl Export variables AC_SUBST(CFLAGS) - AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(INCLUDES) AC_SUBST(ICONV_LIBS) AC_SUBST(REGEX_LIBS) --- 248,254 ---- dnl Export variables AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(INCLUDES) + AC_SUBST(ID3TAG_LIBS) AC_SUBST(ICONV_LIBS) AC_SUBST(REGEX_LIBS) Index: Makefile.in =================================================================== RCS file: /cvsroot/easyh10/easyh10/Makefile.in,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Makefile.in 7 Oct 2006 20:22:59 -0000 1.39 --- Makefile.in 8 Oct 2006 08:32:37 -0000 1.40 *************** *** 119,122 **** --- 119,123 ---- FFLAGS = @FFLAGS@ ICONV_LIBS = @ICONV_LIBS@ + ID3TAG_LIBS = @ID3TAG_LIBS@ INCLUDES = @INCLUDES@ INSTALL_DATA = @INSTALL_DATA@ *************** *** 147,151 **** SHELL = @SHELL@ STRIP = @STRIP@ - TAGLIB_CONFIG = @TAGLIB_CONFIG@ U = @U@ VERSION = @VERSION@ --- 148,151 ---- |
