From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rug8a-0007Bp-N5 for garchives@archives.gentoo.org; Tue, 07 Feb 2012 08:10:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 106B7E0638; Tue, 7 Feb 2012 08:10:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C7A25E0638 for ; Tue, 7 Feb 2012 08:10:44 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E1D81B4031 for ; Tue, 7 Feb 2012 08:10:44 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2272) id D30FC2004C; Tue, 7 Feb 2012 08:10:42 +0000 (UTC) From: "Sergei Trofimovich (slyfox)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, slyfox@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-misc/bb/files: bb-1.3.0_rc1-m4-stuff.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: bb-1.3.0_rc1-m4-stuff.patch X-VCS-Directories: app-misc/bb/files X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich Content-Type: text/plain; charset=utf8 Message-Id: <20120207081042.D30FC2004C@flycatcher.gentoo.org> Date: Tue, 7 Feb 2012 08:10:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6cf462d4-df18-4d64-9ea2-c4ecb42f7870 X-Archives-Hash: 9e7603a7f6cf3df6196af280b8f77dd3 slyfox 12/02/07 08:10:42 Added: bb-1.3.0_rc1-m4-stuff.patch Log: Fix aclocal failure on libmikmod-less systems (bundled .m4 bits). =20 (Portage version: 2.2.0_alpha84_p53/cvs/Linux x86_64) Revision Changes Path 1.1 app-misc/bb/files/bb-1.3.0_rc1-m4-stuff.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/bb/files/= bb-1.3.0_rc1-m4-stuff.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/bb/files/= bb-1.3.0_rc1-m4-stuff.patch?rev=3D1.1&content-type=3Dtext/plain Index: bb-1.3.0_rc1-m4-stuff.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Fix aclocal failure on libmikmod-less systems commit 55b86efdc3e2a1febb593169b10ab252c75fdb10 Author: Sergei Trofimovich Date: Tue Feb 7 10:59:09 2012 +0300 bb-1.3.0_rc1: bundle m4 source diff --git m4/aalib.m4 m4/aalib.m4 new file mode 100644 index 0000000..991fbda --- /dev/null +++ m4/aalib.m4 @@ -0,0 +1,169 @@ +# Configure paths for AALIB +# Jan Hubicka 4/22/2001 +# stolen from Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FO= UND]]]) +dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS +dnl +AC_DEFUN([AM_PATH_AALIB], +[dnl=20 +dnl Get the cflags and libraries from the aalib-config script +dnl +AC_ARG_WITH(aalib-prefix,[ --with-aalib-prefix=3DPFX Prefix where AAL= IB is installed (optional)], + aalib_prefix=3D"$withval", aalib_prefix=3D"") +AC_ARG_WITH(aalib-exec-prefix,[ --with-aalib-exec-prefix=3DPFX Exec pre= fix where AALIB is installed (optional)], + aalib_exec_prefix=3D"$withval", aalib_exec_prefix=3D"") +AC_ARG_ENABLE(aalibtest, [ --disable-aalibtest Do not try to comp= ile and run a test AALIB program], + , enable_aalibtest=3Dyes) + + if test x$aalib_exec_prefix !=3D x ; then + aalib_args=3D"$aalib_args --exec-prefix=3D$aalib_exec_prefix" + if test x${AALIB_CONFIG+set} !=3D xset ; then + AALIB_CONFIG=3D$aalib_exec_prefix/bin/aalib-config + fi + fi + if test x$aalib_prefix !=3D x ; then + aalib_args=3D"$aalib_args --prefix=3D$aalib_prefix" + if test x${AALIB_CONFIG+set} !=3D xset ; then + AALIB_CONFIG=3D$aalib_prefix/bin/aalib-config + fi + fi + + AC_PATH_PROG(AALIB_CONFIG, aalib-config, no) + min_aalib_version=3Difelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for AALIB - version >=3D $min_aalib_version) + no_aalib=3D"" + if test "$AALIB_CONFIG" =3D "no" ; then + no_aalib=3Dyes + else + AALIB_CFLAGS=3D`$AALIB_CONFIG $aalibconf_args --cflags` + AALIB_LIBS=3D`$AALIB_CONFIG $aalibconf_args --libs` + + aalib_major_version=3D`$AALIB_CONFIG $aalib_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + aalib_minor_version=3D`$AALIB_CONFIG $aalib_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + aalib_micro_version=3D`$AALIB_CONFIG $aalib_config_args --version | = \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_aalibtest" =3D "xyes" ; then + ac_save_CFLAGS=3D"$CFLAGS" + ac_save_LIBS=3D"$LIBS" + CFLAGS=3D"$CFLAGS $AALIB_CFLAGS" + LIBS=3D"$LIBS $AALIB_LIBS" +dnl +dnl Now check if the installed AALIB is sufficiently new. (Also sanity +dnl checks the results of aalib-config to some extent +dnl + rm -f conf.aalibtest + AC_TRY_RUN([ +#include +#include +#include +#include "aalib.h" + +char* +my_strdup (char *str) +{ + char *new_str; + =20 + if (str) + { + new_str =3D (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str =3D NULL; + =20 + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.aalibtest"); + */ + { FILE *fp =3D fopen("conf.aalibtest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version =3D my_strdup("$min_aalib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) !=3D 3) { + printf("%s, bad version string\n", "$min_aalib_version"); + exit(1); + } + + if (($aalib_major_version > major) || + (($aalib_major_version =3D=3D major) && ($aalib_minor_version > mi= nor)) || + (($aalib_major_version =3D=3D major) && ($aalib_minor_version =3D=3D= minor) && ($aalib_micro_version >=3D micro))) + { + return 0; + } + else + { + printf("\n*** 'aalib-config --version' returned %d.%d.%d, but the = minimum version\n", $aalib_major_version, $aalib_minor_version, $aalib_mi= cro_version); + printf("*** of AALIB required is %d.%d.%d. If aalib-config is corr= ect, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If aalib-config was wrong, set the environment variabl= e AALIB_CONFIG\n"); + printf("*** to point to the correct copy of aalib-config, and remo= ve the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_aalib=3Dyes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS=3D"$ac_save_CFLAGS" + LIBS=3D"$ac_save_LIBS" + fi + fi + if test "x$no_aalib" =3D x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) =20 + else + AC_MSG_RESULT(no) + if test "$AALIB_CONFIG" =3D "no" ; then + echo "*** The aalib-config script installed by AALIB could not be= found" + echo "*** If AALIB was installed in PREFIX, make sure PREFIX/bin = is in" + echo "*** your path, or set the AALIB_CONFIG environment variable= to the" + echo "*** full path to aalib-config." + else + if test -f conf.aalibtest ; then + : + else + echo "*** Could not run AALIB test program, checking why..." + CFLAGS=3D"$CFLAGS $AALIB_CFLAGS" + LIBS=3D"$LIBS $AALIB_LIBS" + AC_TRY_LINK([ +#include +#include "AALIB.h" +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usu= ally means" + echo "*** that the run-time linker is not finding AALIB or fin= ding the wrong" + echo "*** version of AALIB. If it is not finding AALIB, you'll= need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/l= d.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 modify= ing 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 AALIB w= as incorrectly installed" + echo "*** or that you have moved AALIB since it was installed.= In the latter case, you" + echo "*** may want to edit the aalib-config script: $AALIB_CON= FIG" ]) + CFLAGS=3D"$ac_save_CFLAGS" + LIBS=3D"$ac_save_LIBS" + fi + fi + AALIB_CFLAGS=3D"" + AALIB_LIBS=3D"" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(AALIB_CFLAGS) + AC_SUBST(AALIB_LIBS) + rm -f conf.aalibtest +]) diff --git m4/libmikmod.m4 m4/libmikmod.m4 new file mode 100644 index 0000000..18feebe --- /dev/null +++ m4/libmikmod.m4 @@ -0,0 +1,207 @@ +# Configure paths for libmikmod +# +# Derived from glib.m4 (Owen Taylor 97-11-3) +# Improved by Chris Butler +# + +dnl AM_PATH_LIBMIKMOD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NO= T-FOUND ]]]) +dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and +dnl LIBMIKMOD_LDADD +dnl +AC_DEFUN([AM_PATH_LIBMIKMOD], +[dnl=20 +dnl Get the cflags and libraries from the libmikmod-config script +dnl +AC_ARG_WITH(libmikmod-prefix,[ --with-libmikmod-prefix=3DPFX Prefix w= here libmikmod is installed (optional)], + libmikmod_config_prefix=3D"$withval", libmikmod_config_prefi= x=3D"") +AC_ARG_WITH(libmikmod-exec-prefix,[ --with-libmikmod-exec-prefix=3DPFX = Exec prefix where libmikmod is installed (optional)], + libmikmod_config_exec_prefix=3D"$withval", libmikmod_config_= exec_prefix=3D"") +AC_ARG_ENABLE(libmikmodtest, [ --disable-libmikmodtest Do not try= to compile and run a test libmikmod program], + , enable_libmikmodtest=3Dyes) + + if test x$libmikmod_config_exec_prefix !=3D x ; then + libmikmod_config_args=3D"$libmikmod_config_args --exec-prefix=3D$li= bmikmod_config_exec_prefix" + if test x${LIBMIKMOD_CONFIG+set} !=3D xset ; then + LIBMIKMOD_CONFIG=3D$libmikmod_config_exec_prefix/bin/libmikmod-c= onfig + fi + fi + if test x$libmikmod_config_prefix !=3D x ; then + libmikmod_config_args=3D"$libmikmod_config_args --prefix=3D$libmikm= od_config_prefix" + if test x${LIBMIKMOD_CONFIG+set} !=3D xset ; then + LIBMIKMOD_CONFIG=3D$libmikmod_config_prefix/bin/libmikmod-config + fi + fi + + AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no) + min_libmikmod_version=3Difelse([$1], ,3.1.5,$1) + AC_MSG_CHECKING(for libmikmod - version >=3D $min_libmikmod_version) + no_libmikmod=3D"" + if test "$LIBMIKMOD_CONFIG" =3D "no" ; then + no_libmikmod=3Dyes + else + LIBMIKMOD_CFLAGS=3D`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflag= s` + LIBMIKMOD_LIBS=3D`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs` + LIBMIKMOD_LDADD=3D`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd` + libmikmod_config_major_version=3D`$LIBMIKMOD_CONFIG $libmikmod_confi= g_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'` + libmikmod_config_minor_version=3D`$LIBMIKMOD_CONFIG $libmikmod_confi= g_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'` + libmikmod_config_micro_version=3D`$LIBMIKMOD_CONFIG $libmikmod_confi= g_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'` + if test "x$enable_libmikmodtest" =3D "xyes" ; then + ac_save_CFLAGS=3D"$CFLAGS" + ac_save_LIBS=3D"$LIBS" + AC_LANG_SAVE + AC_LANG_C + CFLAGS=3D"$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD" + LIBS=3D"$LIBMIKMOD_LIBS $LIBS" +dnl +dnl Now check if the installed libmikmod is sufficiently new. (Also sani= ty +dnl checks the results of libmikmod-config to some extent +dnl + rm -f conf.mikmodtest + AC_TRY_RUN([ +#include +#include +#include + +char* my_strdup (char *str) +{ + char *new_str; + + if (str) { + new_str =3D malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } else + new_str =3D NULL; + + return new_str; +} + +int main() +{ + int major,minor,micro; + int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_ve= rsion; + char *tmp_version; + + system("touch conf.mikmodtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version =3D my_strdup("$min_libmikmod_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) !=3D 3) { + printf("%s, bad version string\n", "$min_libmikmod_version"); + exit(1); + } + + libmikmod_major_version=3D(MikMod_GetVersion() >> 16) & 255; + libmikmod_minor_version=3D(MikMod_GetVersion() >> 8) & 255; + libmikmod_micro_version=3D(MikMod_GetVersion() ) & 255; + + if ((libmikmod_major_version !=3D $libmikmod_config_major_version) || + (libmikmod_minor_version !=3D $libmikmod_config_minor_version) || + (libmikmod_micro_version !=3D $libmikmod_config_micro_version)) + { + printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but = libmikmod (%d.%d.%d)\n",=20 + $libmikmod_config_major_version, $libmikmod_config_minor_ve= rsion, $libmikmod_config_micro_version, + libmikmod_major_version, libmikmod_minor_version, libmikmod= _micro_version); + printf ("*** was found! If libmikmod-config was correct, then it i= s best\n"); + printf ("*** to remove the old version of libmikmod. You may also = be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable,= or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if th= at is\n"); + printf("*** required on your system.\n"); + printf("*** If libmikmod-config was wrong, set the environment var= iable LIBMIKMOD_CONFIG\n"); + printf("*** to point to the correct copy of libmikmod-config, and = remove the file config.cache\n"); + printf("*** before re-running configure\n"); + }=20 + else if ((libmikmod_major_version !=3D LIBMIKMOD_VERSION_MAJOR) || + (libmikmod_minor_version !=3D LIBMIKMOD_VERSION_MINOR) || + (libmikmod_micro_version !=3D LIBMIKMOD_REVISION)) + { + printf("*** libmikmod header files (version %d.%d.%d) do not match= \n", + LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISI= ON); + printf("*** library (version %d.%d.%d)\n", + libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_= version); + } + else + { + if ((libmikmod_major_version > major) || + ((libmikmod_major_version =3D=3D major) && (libmikmod_minor_vers= ion > minor)) || + ((libmikmod_major_version =3D=3D major) && (libmikmod_minor_vers= ion =3D=3D minor) && (libmikmod_micro_version >=3D micro))) + { + return 0; + } + else + { + printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\= n", + libmikmod_major_version, libmikmod_minor_version, libmikm= od_micro_version); + printf("*** You need a version of libmikmod newer than %d.%d.%d.= \n", + major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new ver= sion, this error\n"); + printf("*** probably means that the wrong copy of the libmikmod-= config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remov= e the old version\n"); + printf("*** of libmikmod, but you can also set the LIBMIKMOD_CON= FIG environment to point to the\n"); + printf("*** correct copy of libmikmod-config. (In this case, you= will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or = edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time)= )\n"); + } + } + return 1; +} +],, no_libmikmod=3Dyes,[echo $ac_n "cross compiling; assumed OK... $ac_c= "]) + CFLAGS=3D"$ac_save_CFLAGS" + LIBS=3D"$ac_save_LIBS" + AC_LANG_RESTORE + fi + fi + if test "x$no_libmikmod" =3D x ; then + AC_MSG_RESULT([yes, `$LIBMIKMOD_CONFIG --version`]) + ifelse([$2], , :, [$2]) =20 + else + AC_MSG_RESULT(no) + if test "$LIBMIKMOD_CONFIG" =3D "no" ; then + echo "*** The libmikmod-config script installed by libmikmod coul= d not be found" + echo "*** If libmikmod was installed in PREFIX, make sure PREFIX/= bin is in" + echo "*** your path, or set the LIBMIKMOD_CONFIG environment vari= able to the" + echo "*** full path to libmikmod-config." + else + if test -f conf.mikmodtest ; then + : + else + echo "*** Could not run libmikmod test program, checking why..= ." + CFLAGS=3D"$CFLAGS $LIBMIKMOD_CFLAGS" + LIBS=3D"$LIBS $LIBMIKMOD_LIBS" + AC_LANG_SAVE + AC_LANG_C + AC_TRY_LINK([ +#include +#include +], [ return (MikMod_GetVersion()!=3D0); ], + [ echo "*** The test program compiled, but did not run. This usu= ally means" + echo "*** that the run-time linker is not finding libmikmod or= finding the wrong" + echo "*** version of libmikmod. If it is not finding libmikmod= , you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/l= d.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 modify= ing 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 libmikm= od was incorrectly installed" + echo "*** or that you have moved libmikmod since it was instal= led. In the latter case, you" + echo "*** may want to edit the libmikmod-config script: $LIBMI= KMOD_CONFIG" ]) + CFLAGS=3D"$ac_save_CFLAGS" + LIBS=3D"$ac_save_LIBS" + AC_LANG_RESTORE + fi + fi + LIBMIKMOD_CFLAGS=3D"" + LIBMIKMOD_LIBS=3D"" + LIBMIKMOD_LDADD=3D"" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(LIBMIKMOD_CFLAGS) + AC_SUBST(LIBMIKMOD_LIBS) + AC_SUBST(LIBMIKMOD_LDADD) + rm -f conf.mikmodtest +])