From: <ny...@us...> - 2006-06-03 00:40:47
|
Revision: 26 Author: nyaochi Date: 2006-06-02 17:40:44 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/pmplib/?rev=26&view=rev Log Message: ----------- Changed EOL character in configure.in Modified Paths: -------------- trunk/configure.in Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-06-03 00:38:03 UTC (rev 25) +++ trunk/configure.in 2006-06-03 00:40:44 UTC (rev 26) @@ -1,320 +1,320 @@ -dnl $Id$ -dnl -dnl -dnl Exported and configured variables: -dnl CFLAGS -dnl LDFLAGS -dnl INCLUDES - - -dnl Initialization for autoconf -AC_PREREQ(2.53) -AC_INIT -AC_CONFIG_SRCDIR([frontend/easypmp/cui/main.c]) - - -dnl Checks for system -AC_CANONICAL_HOST -AC_AIX -AC_MINIX -AC_ISC_POSIX - -dnl Initialization for automake -AM_INIT_AUTOMAKE(pmplib, 0.11) -AM_CONFIG_HEADER(config.h) -AM_MAINTAINER_MODE -AM_C_PROTOTYPES - -dnl Checks for program -AM_PROG_CC_STDC -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S - -dnl Initialozation for libtool -AC_LIBLTDL_CONVENIENCE -dnl Substitute LTDLINCL and LIBLTDL in the Makefiles -AC_SUBST(LTDLINCL) -AC_SUBST(LIBLTDL) -dnl Check for dlopen support -AC_LIBTOOL_DLOPEN -dnl Configure libtool -AC_PROG_LIBTOOL -dnl Configure libltdl -AC_CONFIG_SUBDIRS(libltdl) - -dnl Initialization for variables -CFLAGS="${ac_save_CFLAGS}" -LDFLAGS="${ac_save_LDFLAGS}" -INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)" - -dnl Additional options - - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h unistd.h stdint.h getopt.h) - - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_CHECK_SIZEOF -AC_TYPE_SIZE_T -AC_STRUCT_TM -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(unsigned short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(unsigned int) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(unsigned long) - -AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t]) - -AH_VERBATIM([HAVE_UINT8_T], -[/* add uint8_t type */ -#undef HAVE_UINT8_T -#ifndef HAVE_UINT8_T - typedef unsigned char uint8_t; -#endif]) - -AH_VERBATIM([HAVE_UINT16_T], -[/* add uint16_t type */ -#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 - -AH_VERBATIM([HAVE_UINT32_T], -[/* add uint32_t type */ -#undef HAVE_UINT32_T -#ifndef HAVE_UINT32_T -#undef A_UINT32_T - typedef A_UINT32_T uint32_t; -#endif]) - -dnl Checks for debugging mode -AC_ARG_ENABLE( - debug, - [AC_HELP_STRING(--enable-debug, [Turn on debugging])] -) - -if test "$enable_debug" = "yes"; then - CFLAGS="-DDEBUG -O -g ${CFLAGS}" -fi - - -dnl Checks for library functions. -AC_FUNC_ALLOCA -AC_FUNC_MEMCMP -AC_FUNC_VPRINTF -AC_CHECK_FUNCS(getcwd mktime strdup strerror strtol strtoul) - -dnl Check for math library -AC_CHECK_LIB(m, rand) - -dnl Check for zlib library -AC_CHECK_LIB(z, uncompress, , [AC_MSG_ERROR(libz not found!)]) - -dnl Check for iconv library -AC_ARG_WITH( - iconv-header, - [AC_HELP_STRING(--with-iconv-header=DIR, [iconv header directory])], - [CFLAGS="-I$withval ${CFLAGS}"] -) - -AC_ARG_WITH( - iconv-library, - [AC_HELP_STRING(--with-iconv-library=DIR, [iconv library directory])], - [LDFLAGS="-L$withval ${LDFLAGS}"; with_libiconv=native], - [with_libiconv=maybe] -) - -AC_CHECK_HEADER(iconv.h, , [AC_MSG_ERROR(iconv.h not found!)]) - -found_iconv=no -case $with_libiconv in - maybe) - # Check in the C library first - AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes]) - # Check if we have GNU libiconv - if test $found_iconv = "no"; then - AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes]) - fi - # Check if we have a iconv in -liconv, possibly from vendor - if test $found_iconv = "no"; then - AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes]) - fi - ;; - no) - AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes]) - ;; - gnu|yes) - AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes]) - ;; - native) - echo "native" - echo $LDFLAGS - # Check if we have GNU libiconv - if test $found_iconv = "no"; then - AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes]) - fi - # Check if we have a iconv in -liconv, possibly from vendor - if test $found_iconv = "no"; then - AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes]) - fi - ;; -esac - -if test "x$found_iconv" = "xno" ; then - AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv]) -fi - -if test x$with_libiconv != xno ; then - case " $INTLLIBS " in - *[[\ \ ]]-liconv[[\ \ ]]*) ;; - *) ICONV_LIBS="-liconv" ;; - esac -fi - -case $with_libiconv in - gnu) - AC_DEFINE(USE_LIBICONV_GNU, 1, [Using GNU libiconv]) - ;; - native) - AC_DEFINE(USE_LIBICONV_NATIVE, 1, [Using a native implementation of iconv in a separate library]) - ;; -esac - - -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!]) -) - -dnl Checks for ogg -AC_ARG_WITH( - ogg-header, - [AC_HELP_STRING(--with-ogg-header=DIR, [ogg header directory])], - [CFLAGS="-I$withval ${CFLAGS}"] -) - -AC_ARG_WITH( - ogg-library, - [AC_HELP_STRING(--with-ogg-library=DIR, [ogg library directory])], - [LDFLAGS="-L$withval ${LDFLAGS}"] -) - -AC_CHECK_HEADER( - ogg/ogg.h, - , - [AC_MSG_ERROR(ogg header not found!)] -) -AC_CHECK_LIB( - ogg, - ogg_stream_init, - [OGG_LIBS="-logg"], - AC_MSG_ERROR([ogg library is not found!]) -) - -dnl Checks for vorbis -AC_ARG_WITH( - vorbis-header, - [AC_HELP_STRING(--with-vorbis-header=DIR, [vorbis header directory])], - [CFLAGS="-I$withval ${CFLAGS}"] -) - -AC_ARG_WITH( - vorbis-library, - [AC_HELP_STRING(--with-vorbis-library=DIR, [vorbis library directory])], - [LDFLAGS="-L$withval ${LDFLAGS}"] -) - -AC_CHECK_HEADER( - vorbis/codec.h, - , - [AC_MSG_ERROR(vorbis header not found!)] -) -AC_CHECK_HEADER( - vorbis/vorbisfile.h, - , - [AC_MSG_ERROR(vorbisfile header not found!)] -) -AC_CHECK_LIB( - vorbis, - vorbis_synthesis_init, - [VORBIS_LIBS="-lvorbis"], - AC_MSG_ERROR([vorbis library is not found!]) -) -AC_CHECK_LIB( - vorbisfile, - ov_open, - [VORBISFILE_LIBS="-lvorbisfile"], - AC_MSG_ERROR([vorbisfile library is not found!]) -) - -dnl ------------------------------------------------------------------ -dnl Check for libsmjs (SpiderMonkey JavaScript engine) -dnl ------------------------------------------------------------------ -AC_PATH_SPIDERMONKEY - -dnl Export variables -AC_SUBST(CFLAGS) -AC_SUBST(LDFLAGS) -AC_SUBST(INCLUDES) -AC_SUBST(ID3TAG_LIBS) -AC_SUBST(ICONV_LIBS) -AC_SUBST(OGG_LIBS) -AC_SUBST(VORBIS_LIBS) -AC_SUBST(VORBISFILE_LIBS) - - -dnl Should the in-tree copy of SMJS be used? Only on Windows. -case "$UNAME_SYSTEM" in - CYGWIN*) - AM_CONDITIONAL([WIN32], true) - ;; - MINGW*) - AM_CONDITIONAL([WIN32], true) - ;; - *) - AM_CONDITIONAL([WIN32], false) - ;; -esac - -dnl Output the configure results. -AC_CONFIG_FILES(Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile) -AC_OUTPUT +dnl $Id$ +dnl +dnl +dnl Exported and configured variables: +dnl CFLAGS +dnl LDFLAGS +dnl INCLUDES + + +dnl Initialization for autoconf +AC_PREREQ(2.53) +AC_INIT +AC_CONFIG_SRCDIR([frontend/easypmp/cui/main.c]) + + +dnl Checks for system +AC_CANONICAL_HOST +AC_AIX +AC_MINIX +AC_ISC_POSIX + +dnl Initialization for automake +AM_INIT_AUTOMAKE(pmplib, 0.11) +AM_CONFIG_HEADER(config.h) +AM_MAINTAINER_MODE +AM_C_PROTOTYPES + +dnl Checks for program +AM_PROG_CC_STDC +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_LN_S + +dnl Initialozation for libtool +AC_LIBLTDL_CONVENIENCE +dnl Substitute LTDLINCL and LIBLTDL in the Makefiles +AC_SUBST(LTDLINCL) +AC_SUBST(LIBLTDL) +dnl Check for dlopen support +AC_LIBTOOL_DLOPEN +dnl Configure libtool +AC_PROG_LIBTOOL +dnl Configure libltdl +AC_CONFIG_SUBDIRS(libltdl) + +dnl Initialization for variables +CFLAGS="${ac_save_CFLAGS}" +LDFLAGS="${ac_save_LDFLAGS}" +INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)" + +dnl Additional options + + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h unistd.h stdint.h getopt.h) + + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_CHECK_SIZEOF +AC_TYPE_SIZE_T +AC_STRUCT_TM +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(unsigned short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(unsigned int) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(unsigned long) + +AC_CHECK_TYPES([uint8_t, uint16_t, uint32_t]) + +AH_VERBATIM([HAVE_UINT8_T], +[/* add uint8_t type */ +#undef HAVE_UINT8_T +#ifndef HAVE_UINT8_T + typedef unsigned char uint8_t; +#endif]) + +AH_VERBATIM([HAVE_UINT16_T], +[/* add uint16_t type */ +#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 + +AH_VERBATIM([HAVE_UINT32_T], +[/* add uint32_t type */ +#undef HAVE_UINT32_T +#ifndef HAVE_UINT32_T +#undef A_UINT32_T + typedef A_UINT32_T uint32_t; +#endif]) + +dnl Checks for debugging mode +AC_ARG_ENABLE( + debug, + [AC_HELP_STRING(--enable-debug, [Turn on debugging])] +) + +if test "$enable_debug" = "yes"; then + CFLAGS="-DDEBUG -O -g ${CFLAGS}" +fi + + +dnl Checks for library functions. +AC_FUNC_ALLOCA +AC_FUNC_MEMCMP +AC_FUNC_VPRINTF +AC_CHECK_FUNCS(getcwd mktime strdup strerror strtol strtoul) + +dnl Check for math library +AC_CHECK_LIB(m, rand) + +dnl Check for zlib library +AC_CHECK_LIB(z, uncompress, , [AC_MSG_ERROR(libz not found!)]) + +dnl Check for iconv library +AC_ARG_WITH( + iconv-header, + [AC_HELP_STRING(--with-iconv-header=DIR, [iconv header directory])], + [CFLAGS="-I$withval ${CFLAGS}"] +) + +AC_ARG_WITH( + iconv-library, + [AC_HELP_STRING(--with-iconv-library=DIR, [iconv library directory])], + [LDFLAGS="-L$withval ${LDFLAGS}"; with_libiconv=native], + [with_libiconv=maybe] +) + +AC_CHECK_HEADER(iconv.h, , [AC_MSG_ERROR(iconv.h not found!)]) + +found_iconv=no +case $with_libiconv in + maybe) + # Check in the C library first + AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes]) + # Check if we have GNU libiconv + if test $found_iconv = "no"; then + AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes]) + fi + # Check if we have a iconv in -liconv, possibly from vendor + if test $found_iconv = "no"; then + AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes]) + fi + ;; + no) + AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes]) + ;; + gnu|yes) + AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes]) + ;; + native) + echo "native" + echo $LDFLAGS + # Check if we have GNU libiconv + if test $found_iconv = "no"; then + AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes]) + fi + # Check if we have a iconv in -liconv, possibly from vendor + if test $found_iconv = "no"; then + AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes]) + fi + ;; +esac + +if test "x$found_iconv" = "xno" ; then + AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv]) +fi + +if test x$with_libiconv != xno ; then + case " $INTLLIBS " in + *[[\ \ ]]-liconv[[\ \ ]]*) ;; + *) ICONV_LIBS="-liconv" ;; + esac +fi + +case $with_libiconv in + gnu) + AC_DEFINE(USE_LIBICONV_GNU, 1, [Using GNU libiconv]) + ;; + native) + AC_DEFINE(USE_LIBICONV_NATIVE, 1, [Using a native implementation of iconv in a separate library]) + ;; +esac + + +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!]) +) + +dnl Checks for ogg +AC_ARG_WITH( + ogg-header, + [AC_HELP_STRING(--with-ogg-header=DIR, [ogg header directory])], + [CFLAGS="-I$withval ${CFLAGS}"] +) + +AC_ARG_WITH( + ogg-library, + [AC_HELP_STRING(--with-ogg-library=DIR, [ogg library directory])], + [LDFLAGS="-L$withval ${LDFLAGS}"] +) + +AC_CHECK_HEADER( + ogg/ogg.h, + , + [AC_MSG_ERROR(ogg header not found!)] +) +AC_CHECK_LIB( + ogg, + ogg_stream_init, + [OGG_LIBS="-logg"], + AC_MSG_ERROR([ogg library is not found!]) +) + +dnl Checks for vorbis +AC_ARG_WITH( + vorbis-header, + [AC_HELP_STRING(--with-vorbis-header=DIR, [vorbis header directory])], + [CFLAGS="-I$withval ${CFLAGS}"] +) + +AC_ARG_WITH( + vorbis-library, + [AC_HELP_STRING(--with-vorbis-library=DIR, [vorbis library directory])], + [LDFLAGS="-L$withval ${LDFLAGS}"] +) + +AC_CHECK_HEADER( + vorbis/codec.h, + , + [AC_MSG_ERROR(vorbis header not found!)] +) +AC_CHECK_HEADER( + vorbis/vorbisfile.h, + , + [AC_MSG_ERROR(vorbisfile header not found!)] +) +AC_CHECK_LIB( + vorbis, + vorbis_synthesis_init, + [VORBIS_LIBS="-lvorbis"], + AC_MSG_ERROR([vorbis library is not found!]) +) +AC_CHECK_LIB( + vorbisfile, + ov_open, + [VORBISFILE_LIBS="-lvorbisfile"], + AC_MSG_ERROR([vorbisfile library is not found!]) +) + +dnl ------------------------------------------------------------------ +dnl Check for libsmjs (SpiderMonkey JavaScript engine) +dnl ------------------------------------------------------------------ +AC_PATH_SPIDERMONKEY + +dnl Export variables +AC_SUBST(CFLAGS) +AC_SUBST(LDFLAGS) +AC_SUBST(INCLUDES) +AC_SUBST(ID3TAG_LIBS) +AC_SUBST(ICONV_LIBS) +AC_SUBST(OGG_LIBS) +AC_SUBST(VORBIS_LIBS) +AC_SUBST(VORBISFILE_LIBS) + + +dnl Should the in-tree copy of SMJS be used? Only on Windows. +case "$UNAME_SYSTEM" in + CYGWIN*) + AM_CONDITIONAL([WIN32], true) + ;; + MINGW*) + AM_CONDITIONAL([WIN32], true) + ;; + *) + AM_CONDITIONAL([WIN32], false) + ;; +esac + +dnl Output the configure results. +AC_CONFIG_FILES(Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile) +AC_OUTPUT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |