From d2b3cd4e7ed80ff8ad6d619032d7352cbecd1562 Mon Sep 17 00:00:00 2001 From: Shohei Urabe Date: Sat, 17 Apr 2004 16:01:13 +0000 Subject: [PATCH] Add libFLAC detection --- ChangeLog | 3 + Makefile.in | 4 + aclocal.m4 | 210 ++++++++++++++++++ autoconf/Makefile.am | 2 + autoconf/Makefile.in | 6 + configs/Makefile.in | 4 + configure | 432 +++++++++++++++++++++++++++++++++++- configure.in | 15 +- doc/C/Makefile.in | 4 + doc/Makefile.in | 4 + doc/ja_JP.eucJP/Makefile.in | 4 + interface/Makefile.in | 8 +- interface/bitmaps/Makefile.in | 4 + interface/motif_bitmaps/Makefile.in | 4 + interface/pixmaps/Makefile.in | 4 + libarc/Makefile.in | 4 + libunimod/Makefile.in | 4 + script/Makefile.in | 4 + timidity/Makefile.in | 4 + utils/Makefile.in | 4 + 20 files changed, 718 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7548dc1b..718fd15e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2004-04-18 URABE Shyouhei * configure.in: fix for libAO detection + * autoconf/libFLAC.m4, autoconf/libOggFLAC.m4 : Add. + * configure.in : Change to use above + * autoconf/Makefile.am : ditto 2004-04-18 Iwata diff --git a/Makefile.in b/Makefile.in index b257c02f..726d106d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -144,7 +144,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/aclocal.m4 b/aclocal.m4 index 6e30c42b..d334b7ed 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2067,6 +2067,216 @@ int main () rm -f conf.vorbistest ]) +# Configure paths for libFLAC +# "Inspired" by ogg.m4 + +dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS +dnl +AC_DEFUN(AM_PATH_LIBFLAC, +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(libFLAC,[ --with-libFLAC=PFX Prefix where libFLAC is installed (optional)], libFLAC_prefix="$withval", libFLAC_prefix="") +AC_ARG_WITH(libFLAC-libraries,[ --with-libFLAC-libraries=DIR Directory where libFLAC library is installed (optional)], libFLAC_libraries="$withval", libFLAC_libraries="") +AC_ARG_WITH(libFLAC-includes,[ --with-libFLAC-includes=DIR Directory where libFLAC header files are installed (optional)], libFLAC_includes="$withval", libFLAC_includes="") +AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes) + + if test "x$libFLAC_libraries" != "x" ; then + LIBFLAC_LIBS="-L$libFLAC_libraries" + elif test "x$libFLAC_prefix" != "x" ; then + LIBFLAC_LIBS="-L$libFLAC_prefix/lib" + elif test "x$prefix" != "xNONE" ; then + LIBFLAC_LIBS="-L$prefix/lib" + fi + + LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm" + + if test "x$libFLAC_includes" != "x" ; then + LIBFLAC_CFLAGS="-I$libFLAC_includes" + elif test "x$libFLAC_prefix" != "x" ; then + LIBFLAC_CFLAGS="-I$libFLAC_prefix/include" + elif test "$prefix" != "xNONE"; then + LIBFLAC_CFLAGS="-I$prefix/include" + fi + + AC_MSG_CHECKING(for libFLAC) + no_libFLAC="" + + + if test "x$enable_libFLACtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" + CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS" + LIBS="$LIBS $LIBFLAC_LIBS" +dnl +dnl Now check if the installed libFLAC is sufficiently new. +dnl + rm -f conf.libFLACtest + AC_TRY_RUN([ +#include +#include +#include +#include + +int main () +{ + system("touch conf.libFLACtest"); + return 0; +} + +],, no_libFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_libFLAC" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + if test -f conf.libFLACtest ; then + : + else + echo "*** Could not run libFLAC test program, checking why..." + CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" + LIBS="$LIBS $LIBFLAC_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libFLAC or finding the wrong" + echo "*** version of libFLAC. If it is not finding libFLAC, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libFLAC was incorrectly installed" + echo "*** or that you have moved libFLAC since it was installed. In the latter case, you" + echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + LIBFLAC_CFLAGS="" + LIBFLAC_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(LIBFLAC_CFLAGS) + AC_SUBST(LIBFLAC_LIBS) + rm -f conf.libFLACtest +]) + +# Configure paths for libOggFLAC +# "Inspired" by ogg.m4 + +dnl AM_PATH_LIBOGGFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libOggFLAC, and define LIBOGGFLAC_CFLAGS and LIBOGGFLAC_LIBS +dnl +AC_DEFUN(AM_PATH_LIBOGGFLAC, +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(libOggFLAC,[ --with-libOggFLAC=PFX Prefix where libOggFLAC is installed (optional)], libOggFLAC_prefix="$withval", libOggFLAC_prefix="") +AC_ARG_WITH(libOggFLAC-libraries,[ --with-libOggFLAC-libraries=DIR Directory where libOggFLAC library is installed (optional)], libOggFLAC_libraries="$withval", libOggFLAC_libraries="") +AC_ARG_WITH(libOggFLAC-includes,[ --with-libOggFLAC-includes=DIR Directory where libOggFLAC header files are installed (optional)], libOggFLAC_includes="$withval", libOggFLAC_includes="") +AC_ARG_ENABLE(libOggFLACtest, [ --disable-libOggFLACtest Do not try to compile and run a test libOggFLAC program],, enable_libOggFLACtest=yes) + + if test "x$libOggFLAC_libraries" != "x" ; then + LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries" + elif test "x$libOggFLAC_prefix" != "x" ; then + LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib" + elif test "x$prefix" != "xNONE" ; then + LIBOGGFLAC_LIBS="-L$prefix/lib" + fi + + LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm" + + if test "x$libOggFLAC_includes" != "x" ; then + LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes" + elif test "x$libOggFLAC_prefix" != "x" ; then + LIBOGGFLAC_CFLAGS="-I$libOggFLAC_prefix/include" + elif test "$prefix" != "xNONE"; then + LIBOGGFLAC_CFLAGS="-I$prefix/include" + fi + + AC_MSG_CHECKING(for libOggFLAC) + no_libOggFLAC="" + + + if test "x$enable_libOggFLACtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" + CXXFLAGS="$CXXFLAGS $LIBOGGFLAC_CFLAGS" + LIBS="$LIBS $LIBOGGFLAC_LIBS" +dnl +dnl Now check if the installed libOggFLAC is sufficiently new. +dnl + rm -f conf.libOggFLACtest + AC_TRY_RUN([ +#include +#include +#include +#include + +int main () +{ + system("touch conf.libOggFLACtest"); + return 0; +} + +],, no_libOggFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_libOggFLAC" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + if test -f conf.libOggFLACtest ; then + : + else + echo "*** Could not run libOggFLAC test program, checking why..." + CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" + LIBS="$LIBS $LIBOGGFLAC_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong" + echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed" + echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you" + echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + LIBOGGFLAC_CFLAGS="" + LIBOGGFLAC_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(LIBOGGFLAC_CFLAGS) + AC_SUBST(LIBOGGFLAC_LIBS) + rm -f conf.libOggFLACtest +]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am index 28e552dc..d02c75cb 100644 --- a/autoconf/Makefile.am +++ b/autoconf/Makefile.am @@ -23,6 +23,8 @@ EXTRA_DIST = \ arts.m4 \ esd.m4 \ gtk.m4 \ + libFLAC.m4 \ + libOggFLAC.m4 \ ogg.m4 \ utils.m4 \ vorbis.m4 \ No newline at end of file diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in index 96fe03e7..958e8c7c 100644 --- a/autoconf/Makefile.in +++ b/autoconf/Makefile.in @@ -143,7 +143,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -252,6 +256,8 @@ EXTRA_DIST = \ arts.m4 \ esd.m4 \ gtk.m4 \ + libFLAC.m4 \ + libOggFLAC.m4 \ ogg.m4 \ utils.m4 \ vorbis.m4 diff --git a/configs/Makefile.in b/configs/Makefile.in index c5e9e782..0ce4bd0f 100644 --- a/configs/Makefile.in +++ b/configs/Makefile.in @@ -143,7 +143,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/configure b/configure index 3b0eb193..3b7c3bc9 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #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 target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT EMACS lispdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB LN_S X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS NEEDGETOPT_TRUE NEEDGETOPT_FALSE ALSA_CFLAGS ALSA_LIBS ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS AO_CFLAGS AO_LIBS VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS NEEDDLOPEN_TRUE NEEDDLOPEN_FALSE ENABLE_NCURSES_TRUE ENABLE_NCURSES_FALSE n_so_libs ENABLE_SLANG_TRUE ENABLE_SLANG_FALSE s_so_libs ENABLE_MOTIF_TRUE ENABLE_MOTIF_FALSE m_so_libs ENABLE_TCLTK_TRUE ENABLE_TCLTK_FALSE k_so_libs ENABLE_DYNAMIC_TCLTK_TRUE ENABLE_DYNAMIC_TCLTK_FALSE ENABLE_EMACS_TRUE ENABLE_EMACS_FALSE e_so_libs ENABLE_VT100_TRUE ENABLE_VT100_FALSE T_so_libs ENABLE_XAW_TRUE ENABLE_XAW_FALSE a_so_libs ENABLE_DYNAMIC_XAW_TRUE ENABLE_DYNAMIC_XAW_FALSE ENABLE_XSKIN_TRUE ENABLE_XSKIN_FALSE i_so_libs ENABLE_GTK_TRUE ENABLE_GTK_FALSE GTK_CONFIG GTK_CFLAGS GTK_LIBS g_so_libs ENABLE_SERVER_TRUE ENABLE_SERVER_FALSE r_so_libs ENABLE_ALSASEQ_TRUE ENABLE_ALSASEQ_FALSE A_so_libs ENABLE_WINSYN_TRUE ENABLE_WINSYN_FALSE W_so_libs ENABLE_PORTMIDISYN_TRUE ENABLE_PORTMIDISYN_FALSE P_so_libs ENABLE_W32G_SYN_TRUE ENABLE_W32G_SYN_FALSE ENABLE_W32GUI_TRUE ENABLE_W32GUI_FALSE w_so_libs ENABLE_PLUGIN_TRUE ENABLE_PLUGIN_FALSE p_so_libs ENABLE_NETWORK_TRUE ENABLE_NETWORK_FALSE ENABLE_SOUND_SPEC_TRUE ENABLE_SOUND_SPEC_FALSE ENABLE_WRD_TRUE ENABLE_WRD_FALSE CYGNUS_TRUE CYGNUS_FALSE MINGW_TRUE MINGW_FALSE W32READDIR_TRUE W32READDIR_FALSE timidity_LDFLAGS SYSEXTRAS EXTRALIBS NETSRCS ELFILES SHLD SHCFLAGS dynamic_targets so WISH tcltk_dep INTERFACE_SRCS pkgdatadir pkglibdir LTLIBOBJS' +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 target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT EMACS lispdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB LN_S X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS NEEDGETOPT_TRUE NEEDGETOPT_FALSE ALSA_CFLAGS ALSA_LIBS ARTS_CONFIG ARTS_CFLAGS ARTS_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS AO_CFLAGS AO_LIBS VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS OGG_CFLAGS OGG_LIBS LIBFLAC_CFLAGS LIBFLAC_LIBS LIBOGGFLAC_CFLAGS LIBOGGFLAC_LIBS NEEDDLOPEN_TRUE NEEDDLOPEN_FALSE ENABLE_NCURSES_TRUE ENABLE_NCURSES_FALSE n_so_libs ENABLE_SLANG_TRUE ENABLE_SLANG_FALSE s_so_libs ENABLE_MOTIF_TRUE ENABLE_MOTIF_FALSE m_so_libs ENABLE_TCLTK_TRUE ENABLE_TCLTK_FALSE k_so_libs ENABLE_DYNAMIC_TCLTK_TRUE ENABLE_DYNAMIC_TCLTK_FALSE ENABLE_EMACS_TRUE ENABLE_EMACS_FALSE e_so_libs ENABLE_VT100_TRUE ENABLE_VT100_FALSE T_so_libs ENABLE_XAW_TRUE ENABLE_XAW_FALSE a_so_libs ENABLE_DYNAMIC_XAW_TRUE ENABLE_DYNAMIC_XAW_FALSE ENABLE_XSKIN_TRUE ENABLE_XSKIN_FALSE i_so_libs ENABLE_GTK_TRUE ENABLE_GTK_FALSE GTK_CONFIG GTK_CFLAGS GTK_LIBS g_so_libs ENABLE_SERVER_TRUE ENABLE_SERVER_FALSE r_so_libs ENABLE_ALSASEQ_TRUE ENABLE_ALSASEQ_FALSE A_so_libs ENABLE_WINSYN_TRUE ENABLE_WINSYN_FALSE W_so_libs ENABLE_PORTMIDISYN_TRUE ENABLE_PORTMIDISYN_FALSE P_so_libs ENABLE_W32G_SYN_TRUE ENABLE_W32G_SYN_FALSE ENABLE_W32GUI_TRUE ENABLE_W32GUI_FALSE w_so_libs ENABLE_PLUGIN_TRUE ENABLE_PLUGIN_FALSE p_so_libs ENABLE_NETWORK_TRUE ENABLE_NETWORK_FALSE ENABLE_SOUND_SPEC_TRUE ENABLE_SOUND_SPEC_FALSE ENABLE_WRD_TRUE ENABLE_WRD_FALSE CYGNUS_TRUE CYGNUS_FALSE MINGW_TRUE MINGW_FALSE W32READDIR_TRUE W32READDIR_FALSE timidity_LDFLAGS SYSEXTRAS EXTRALIBS NETSRCS ELFILES SHLD SHCFLAGS dynamic_targets so WISH tcltk_dep INTERFACE_SRCS pkgdatadir pkglibdir LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -890,6 +890,8 @@ Optional Features: --disable-aotest Do not try to compile and run a test ao program --disable-oggtest Do not try to compile and run a test Ogg program --disable-vorbistest Do not try to compile and run a test Vorbis program + --disable-libFLACtest Do not try to compile and run a test libFLAC program + --disable-libOggFLACtest Do not try to compile and run a test libOggFLAC program --enable-interface=interface_list Comma separated interface list --enable-dynamic Enable dynamic link interface (default is no) @@ -960,6 +962,12 @@ Optional Packages: --with-vorbis=PFX Prefix where libvorbis is installed (optional) --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional) --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional) + --with-libFLAC=PFX Prefix where libFLAC is installed (optional) + --with-libFLAC-libraries=DIR Directory where libFLAC library is installed (optional) + --with-libFLAC-includes=DIR Directory where libFLAC header files are installed (optional) + --with-libOggFLAC=PFX Prefix where libOggFLAC is installed (optional) + --with-libOggFLAC-libraries=DIR Directory where libOggFLAC library is installed (optional) + --with-libOggFLAC-includes=DIR Directory where libOggFLAC header files are installed (optional) --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) @@ -14073,11 +14081,421 @@ fi echo "$as_me:$LINENO: checking enable_audio=flac" >&5 echo $ECHO_N "checking enable_audio=flac... $ECHO_C" >&6 if test "x$au_enable_flac" = xyes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: result: yes, configuring flac" >&5 +echo "${ECHO_T}yes, configuring flac" >&6 SYSEXTRAS="$SYSEXTRAS flac_a.c" - EXTRALIBS="$EXTRALIBS -lOggFLAC -lFLAC -logg" - EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_OGGFLAC" + +# Check whether --with-libFLAC or --without-libFLAC was given. +if test "${with_libFLAC+set}" = set; then + withval="$with_libFLAC" + libFLAC_prefix="$withval" +else + libFLAC_prefix="" +fi; + +# Check whether --with-libFLAC-libraries or --without-libFLAC-libraries was given. +if test "${with_libFLAC_libraries+set}" = set; then + withval="$with_libFLAC_libraries" + libFLAC_libraries="$withval" +else + libFLAC_libraries="" +fi; + +# Check whether --with-libFLAC-includes or --without-libFLAC-includes was given. +if test "${with_libFLAC_includes+set}" = set; then + withval="$with_libFLAC_includes" + libFLAC_includes="$withval" +else + libFLAC_includes="" +fi; +# Check whether --enable-libFLACtest or --disable-libFLACtest was given. +if test "${enable_libFLACtest+set}" = set; then + enableval="$enable_libFLACtest" + +else + enable_libFLACtest=yes +fi; + + if test "x$libFLAC_libraries" != "x" ; then + LIBFLAC_LIBS="-L$libFLAC_libraries" + elif test "x$libFLAC_prefix" != "x" ; then + LIBFLAC_LIBS="-L$libFLAC_prefix/lib" + elif test "x$prefix" != "xNONE" ; then + LIBFLAC_LIBS="-L$prefix/lib" + fi + + LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm" + + if test "x$libFLAC_includes" != "x" ; then + LIBFLAC_CFLAGS="-I$libFLAC_includes" + elif test "x$libFLAC_prefix" != "x" ; then + LIBFLAC_CFLAGS="-I$libFLAC_prefix/include" + elif test "$prefix" != "xNONE"; then + LIBFLAC_CFLAGS="-I$prefix/include" + fi + + echo "$as_me:$LINENO: checking for libFLAC" >&5 +echo $ECHO_N "checking for libFLAC... $ECHO_C" >&6 + no_libFLAC="" + + + if test "x$enable_libFLACtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" + CXXFLAGS="$CXXFLAGS $LIBFLAC_CFLAGS" + LIBS="$LIBS $LIBFLAC_LIBS" + rm -f conf.libFLACtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include +#include + +int main () +{ + system("touch conf.libFLACtest"); + return 0; +} + + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./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 + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +no_libFLAC=yes +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_libFLAC" = "x" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + EXTRADEFS="$EXTRADEFS -DAU_FLAC" + for f in $LIBFLAC_CFLAGS; do + case ".$f" in + .-I?*|.-D?*) CPPFLAGS="$CPPFLAGS $f" ;; + *) CFLAGS="$CPPFLAGS $f" ;; + esac +done + + LIBS="$KEEPLIBS $LIBFLAC_LIBS" + + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test -f conf.libFLACtest ; then + : + else + echo "*** Could not run libFLAC test program, checking why..." + CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" + LIBS="$LIBS $LIBFLAC_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + return 0; + ; + 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 + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libFLAC or finding the wrong" + echo "*** version of libFLAC. If it is not finding libFLAC, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libFLAC was incorrectly installed" + echo "*** or that you have moved libFLAC since it was installed. In the latter case, you" + echo "*** may want to edit the libFLAC-config script: $LIBFLAC_CONFIG" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + LIBFLAC_CFLAGS="" + LIBFLAC_LIBS="" + : + fi + + + rm -f conf.libFLACtest + + +# Check whether --with-libOggFLAC or --without-libOggFLAC was given. +if test "${with_libOggFLAC+set}" = set; then + withval="$with_libOggFLAC" + libOggFLAC_prefix="$withval" +else + libOggFLAC_prefix="" +fi; + +# Check whether --with-libOggFLAC-libraries or --without-libOggFLAC-libraries was given. +if test "${with_libOggFLAC_libraries+set}" = set; then + withval="$with_libOggFLAC_libraries" + libOggFLAC_libraries="$withval" +else + libOggFLAC_libraries="" +fi; + +# Check whether --with-libOggFLAC-includes or --without-libOggFLAC-includes was given. +if test "${with_libOggFLAC_includes+set}" = set; then + withval="$with_libOggFLAC_includes" + libOggFLAC_includes="$withval" +else + libOggFLAC_includes="" +fi; +# Check whether --enable-libOggFLACtest or --disable-libOggFLACtest was given. +if test "${enable_libOggFLACtest+set}" = set; then + enableval="$enable_libOggFLACtest" + +else + enable_libOggFLACtest=yes +fi; + + if test "x$libOggFLAC_libraries" != "x" ; then + LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries" + elif test "x$libOggFLAC_prefix" != "x" ; then + LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib" + elif test "x$prefix" != "xNONE" ; then + LIBOGGFLAC_LIBS="-L$prefix/lib" + fi + + LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm" + + if test "x$libOggFLAC_includes" != "x" ; then + LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes" + elif test "x$libOggFLAC_prefix" != "x" ; then + LIBOGGFLAC_CFLAGS="-I$libOggFLAC_prefix/include" + elif test "$prefix" != "xNONE"; then + LIBOGGFLAC_CFLAGS="-I$prefix/include" + fi + + echo "$as_me:$LINENO: checking for libOggFLAC" >&5 +echo $ECHO_N "checking for libOggFLAC... $ECHO_C" >&6 + no_libOggFLAC="" + + + if test "x$enable_libOggFLACtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" + CXXFLAGS="$CXXFLAGS $LIBOGGFLAC_CFLAGS" + LIBS="$LIBS $LIBOGGFLAC_LIBS" + rm -f conf.libOggFLACtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include +#include + +int main () +{ + system("touch conf.libOggFLACtest"); + return 0; +} + + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./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 + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +no_libOggFLAC=yes +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_libOggFLAC" = "x" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" + for f in $LIBOGGFLAC_CFLAGS; do + case ".$f" in + .-I?*|.-D?*) CPPFLAGS="$CPPFLAGS $f" ;; + *) CFLAGS="$CPPFLAGS $f" ;; + esac +done + + LIBS="$KEEPLIBS $LIBOGGFLAC_LIBS" + + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test -f conf.libOggFLACtest ; then + : + else + echo "*** Could not run libOggFLAC test program, checking why..." + CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS" + LIBS="$LIBS $LIBOGGFLAC_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + return 0; + ; + 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 + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong" + echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed" + echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you" + echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + LIBOGGFLAC_CFLAGS="" + LIBOGGFLAC_LIBS="" + : + fi + + + rm -f conf.libOggFLACtest + else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -19411,6 +19829,10 @@ s,@VORBISFILE_LIBS@,$VORBISFILE_LIBS,;t t s,@VORBISENC_LIBS@,$VORBISENC_LIBS,;t t s,@OGG_CFLAGS@,$OGG_CFLAGS,;t t s,@OGG_LIBS@,$OGG_LIBS,;t t +s,@LIBFLAC_CFLAGS@,$LIBFLAC_CFLAGS,;t t +s,@LIBFLAC_LIBS@,$LIBFLAC_LIBS,;t t +s,@LIBOGGFLAC_CFLAGS@,$LIBOGGFLAC_CFLAGS,;t t +s,@LIBOGGFLAC_LIBS@,$LIBOGGFLAC_LIBS,;t t s,@NEEDDLOPEN_TRUE@,$NEEDDLOPEN_TRUE,;t t s,@NEEDDLOPEN_FALSE@,$NEEDDLOPEN_FALSE,;t t s,@ENABLE_NCURSES_TRUE@,$ENABLE_NCURSES_TRUE,;t t diff --git a/configure.in b/configure.in index 652d89a5..b01bccf5 100644 --- a/configure.in +++ b/configure.in @@ -1094,12 +1094,21 @@ else AC_MSG_RESULT(no) fi +dnl libFLAC - Free Lossless Audio Codec AC_MSG_CHECKING(enable_audio=flac) if test "x$au_enable_flac" = xyes; then - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes, configuring flac]) SYSEXTRAS="$SYSEXTRAS flac_a.c" - EXTRALIBS="$EXTRALIBS -lOggFLAC -lFLAC -logg" - EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_OGGFLAC" + AM_PATH_LIBFLAC([ + EXTRADEFS="$EXTRADEFS -DAU_FLAC" + EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS) + LIBS="$KEEPLIBS $LIBFLAC_LIBS" + ]) + AM_PATH_LIBOGGFLAC([ + EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC" + EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS) + LIBS="$KEEPLIBS $LIBOGGFLAC_LIBS" + ]) else AC_MSG_RESULT(no) fi diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in index 672b846e..f69a3289 100644 --- a/doc/C/Makefile.in +++ b/doc/C/Makefile.in @@ -142,7 +142,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 3cb148de..35a69555 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -166,7 +166,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/doc/ja_JP.eucJP/Makefile.in b/doc/ja_JP.eucJP/Makefile.in index 1892e676..495702a7 100644 --- a/doc/ja_JP.eucJP/Makefile.in +++ b/doc/ja_JP.eucJP/Makefile.in @@ -142,7 +142,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/interface/Makefile.in b/interface/Makefile.in index 7ae771b0..c7a5b56b 100644 --- a/interface/Makefile.in +++ b/interface/Makefile.in @@ -166,7 +166,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -472,12 +476,12 @@ EXTRA_DIST = \ interface_n.txt \ interface_s.txt -@ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk @ENABLE_TCLTK_TRUE@install_tk = install.tk -@ENABLE_DYNAMIC_XAW_TRUE@install_xaw = install.xaw +@ENABLE_DYNAMIC_TCLTK_TRUE@install_tk = install.tk @ENABLE_XAW_TRUE@install_xaw = install.xaw +@ENABLE_DYNAMIC_XAW_TRUE@install_xaw = install.xaw # ELFILES = @ELFILES@ # autoconf already define this @ENABLE_EMACS_TRUE@install_el = install.el diff --git a/interface/bitmaps/Makefile.in b/interface/bitmaps/Makefile.in index 67a7b40a..37698ccf 100644 --- a/interface/bitmaps/Makefile.in +++ b/interface/bitmaps/Makefile.in @@ -166,7 +166,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/interface/motif_bitmaps/Makefile.in b/interface/motif_bitmaps/Makefile.in index 8dfe99de..a966d05e 100644 --- a/interface/motif_bitmaps/Makefile.in +++ b/interface/motif_bitmaps/Makefile.in @@ -148,7 +148,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/interface/pixmaps/Makefile.in b/interface/pixmaps/Makefile.in index eb1ba2b4..2f1e32f0 100644 --- a/interface/pixmaps/Makefile.in +++ b/interface/pixmaps/Makefile.in @@ -148,7 +148,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/libarc/Makefile.in b/libarc/Makefile.in index 511706a8..1df9ae70 100644 --- a/libarc/Makefile.in +++ b/libarc/Makefile.in @@ -166,7 +166,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/libunimod/Makefile.in b/libunimod/Makefile.in index 7c220cae..58a9e418 100644 --- a/libunimod/Makefile.in +++ b/libunimod/Makefile.in @@ -166,7 +166,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/script/Makefile.in b/script/Makefile.in index fbd548ef..8a98cd0c 100644 --- a/script/Makefile.in +++ b/script/Makefile.in @@ -142,7 +142,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/timidity/Makefile.in b/timidity/Makefile.in index a8444542..a383d12b 100644 --- a/timidity/Makefile.in +++ b/timidity/Makefile.in @@ -166,7 +166,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/utils/Makefile.in b/utils/Makefile.in index af96df87..6024182a 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -166,7 +166,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERFACE_SRCS = @INTERFACE_SRCS@ LDFLAGS = @LDFLAGS@ +LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ +LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBOBJS = @LIBOBJS@ +LIBOGGFLAC_CFLAGS = @LIBOGGFLAC_CFLAGS@ +LIBOGGFLAC_LIBS = @LIBOGGFLAC_LIBS@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -- 2.11.0