Commit 3f11d3ef authored by Stephen Kitt's avatar Stephen Kitt

Imported Upstream version 3.2.5

parent 22c81f8e
# if necessary, set CMAKE_PREFIX_PATH to the path where libmikmod
# is installed, which you can do on your cmake command line, like:
# cmake -DCMAKE_PREFIX_PATH=/path/to/libmikmod_dir ....
PROJECT(mikmod C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
LIST(APPEND CMAKE_MODULE_PATH "${mikmod_SOURCE_DIR}/cmake")
SET (VERSION "3.2.5")
STRING (REGEX MATCHALL "([0-9]+)" VERSION_DIGITS "${VERSION}")
LIST(GET VERSION_DIGITS 0 CPACK_PACKAGE_VERSION_MAJOR)
LIST(GET VERSION_DIGITS 1 CPACK_PACKAGE_VERSION_MINOR)
LIST(GET VERSION_DIGITS 2 CPACK_PACKAGE_VERSION_PATCH)
# package generation (make package[_source])
SET(CPACK_PACKAGE_NAME "mikmod")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MikMod - a module player")
SET(CPACK_PACKAGE_VENDOR "Shlomi Fish")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_DESCRIPTION_SUMMARY} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
SET (base_with_ver "mikmod-[0-9]+\\\\.[0-9]+\\\\.[0-9]+")
SET(CPACK_SOURCE_IGNORE_FILES
"/_CPack_Packages/"
"/CMakeFiles/"
"/.deps/"
"^${base_with_ver}(-Source|-Linux)?/"
"${base_with_ver}.tar\\\\.(gz|bz2|Z|lzma|xz)$"
"\\\\.o$"
"~$"
"/\\\\.svn/"
"/CMakeCache\\\\.txt$"
"/CTestTestfile\\\\.cmake$"
"/cmake_install\\\\.cmake$"
"/CPackConfig\\\\.cmake$"
"/CPackSourceConfig\\\\.cmake$"
"/tags$"
"^config\\\\.h$"
"/install_manifest\\\\.txt$"
"/Testing/"
"ids-whitelist\\\\.txt"
"/_Inline/"
"/(B|build|BUILD)/"
"/autom4te.cache/"
)
INCLUDE(CPack)
INCLUDE(CheckFunctionExists)
INCLUDE(CheckSymbolExists)
INCLUDE(CheckCCompilerFlag)
INCLUDE(CheckCSourceCompiles)
include(mik_macros)
find_path(MIKMOD_INCLUDE_DIR mikmod.h)
find_library(MIKMOD_LIBRARIES mikmod)
IF (MIKMOD_LIBRARIES STREQUAL "MIKMOD_LIBRARIES-NOTFOUND")
MESSAGE(FATAL_ERROR "libmikmod not found.")
ELSE()
MESSAGE(STATUS "Found MikMod: ${MIKMOD_LIBRARIES}")
ENDIF()
IF(UNIX OR APPLE)
INCLUDE(FindCurses)
IF(NOT CURSES_FOUND)
MESSAGE(FATAL_ERROR "Curses not found.")
ENDIF()
ENDIF()
CHECK_MULTI_INCLUDE_FILES(
"ncurses.h"
"fcntl.h" "fnmatch.h" "inttypes.h" "limits.h" "memory.h" "sched.h"
"sys/ioctl.h" "sys/wait.h" "sys/time.h" "sys/types.h" "sys/stat.h"
"stdint.h" "stdlib.h" "string.h" "strings.h" "termios.h" "unistd.h"
"pthread.h"
)
CHECK_SYMBOL_EXISTS(TIOCGWINSZ "sys/ioctl.h" GWINSZ_IN_SYS_IOCTL)
CHECK_SYMBOL_EXISTS(usleep unistd.h HAVE_USLEEP_PROTO)
IF (NOT HAVE_USLEEP_PROTO)
CHECK_SYMBOL_EXISTS(usleep "sys/unistd.h" HAVE_USLEEP_PROTO)
ENDIF()
IF (HAVE_PTHREAD_H)
SET (HAVE_PTHREAD 1)
ENDIF (HAVE_PTHREAD_H)
CHECK_MULTI_FUNCTIONS_EXISTS(
"getopt_long_only"
mkstemp srandom snprintf vsnprintf strerror
usleep
srandom
fnmatch
memcmp
vprintf
)
IF (HAVE_USLEEP)
SET (HAVE_USLEEP_PROTO 1)
ENDIF (HAVE_USLEEP)
CHECK_C_SOURCE_COMPILES(
"#include <sys/types.h>
#include <signal.h>
int main(void) { return *(signal(0,0))(0) == 1; }"
RETSIGTYPE_INT
)
if(RETSIGTYPE_INT)
set(RETSIGTYPE int)
else(RETSIGTYPE_INT)
set(RETSIGTYPE void)
endif(RETSIGTYPE_INT)
MESSAGE(STATUS "Return type of signal handlers: ${RETSIGTYPE}")
SET(CMAKE_REQUIRED_LIBRARIES "ncurses")
CHECK_FUNCTION_EXISTS (resizeterm HAVE_NCURSES_RESIZETERM)
SET(CMAKE_REQUIRED_INCLUDES ${MIKMOD_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${MIKMOD_LIBRARIES})
CHECK_FUNCTION_EXISTS (MikMod_free HAVE_MIKMOD_FREE)
########### compiler flags ##############
SET(COMPILER_FLAGS_TO_CHECK
"-Wall" "-Werror=implicit-function-declaration"
)
IF (CPU_ARCH)
LIST(APPEND COMPILER_FLAGS_TO_CHECK "-march=${CPU_ARCH}")
ENDIF(CPU_ARCH)
SET (IDX 1)
FOREACH (CFLAG_TO_CHECK ${COMPILER_FLAGS_TO_CHECK})
SET (FLAG_EXISTS_VAR "FLAG_EXISTS_${IDX}")
MATH (EXPR IDX "${IDX} + 1")
CHECK_C_COMPILER_FLAG("${CFLAG_TO_CHECK}" ${FLAG_EXISTS_VAR})
IF (${FLAG_EXISTS_VAR})
ADD_DEFINITIONS(${CFLAG_TO_CHECK})
ENDIF (${FLAG_EXISTS_VAR})
ENDFOREACH(CFLAG_TO_CHECK)
########### install files ###############
ADD_DEFINITIONS("-DHAVE_CONFIG_H")
SET (PACKAGE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/mikmod")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
# So it can find the includes when building libavl.avl.h.
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
# So it can find config.h
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
install(
FILES
mikmodrc
DESTINATION
"share/mikmod"
)
add_subdirectory(src)
add_subdirectory(dos)
add_subdirectory(os2)
add_subdirectory(win32)
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
......@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
......@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
......@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
......@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
......@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
......@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
......@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
......@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src dos os2 win32
pkgdata_DATA = mikmodrc
EXTRA_DIST = mikmod-3.2.4.lsm \
convert_playlist mikmod.cfg $(pkgdata_DATA)
EXTRA_DIST = mikmod-3.2.5.lsm \
convert_playlist mikmod.cfg $(pkgdata_DATA) \
config.h.cmake CMakeLists.txt cmake
......@@ -54,16 +54,18 @@ host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING INSTALL NEWS compile \
config.guess config.sub depcomp install-sh missing \
mkinstalldirs
$(top_srcdir)/configure AUTHORS COPYING INSTALL NEWS \
autotools/compile autotools/config.guess autotools/config.sub \
autotools/depcomp autotools/install-sh autotools/missing \
autotools/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/m4/libmikmod.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
......@@ -199,6 +201,7 @@ MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
......@@ -261,10 +264,12 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src dos os2 win32
pkgdata_DATA = mikmodrc
EXTRA_DIST = mikmod-3.2.4.lsm \
convert_playlist mikmod.cfg $(pkgdata_DATA)
EXTRA_DIST = mikmod-3.2.5.lsm \
convert_playlist mikmod.cfg $(pkgdata_DATA) \
config.h.cmake CMakeLists.txt cmake
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......
Summary of changes between MikMod 3.2.4 and MikMod 3.2.5 ():
==================================================================
MikMod 3.2.4 was released on 10-Jan-2014.
- New CMake build system.
- Small autotols updates.
- Fix configury $datadir variable expansion in PACKAGE_DATA_DIR.
- Fix ALSA driver options menu for libmikmod2 versions >= 3.1.13.
- Fix compilation against ancient libmikmod1 versions <= 3.1.6.
- Several code clean-ups.
Summary of changes between MikMod 3.2.3 and MikMod 3.2.4 ():
==================================================================
......@@ -100,6 +113,51 @@ PLATFORM SPECIFIC
srandom() seed on UNIX platforms. Its primary intent is to assist in
testing - see https://bitbucket.org/shlomif/mikmod-test-suite .
Summary of changes between MikMod 3.2.0 and MikMod 3.2.1:
================================================================
MikMod 3.2.1 was released on 07/10/2003
BUGFIXES
- Enable/disable color gui should have appeared in configuration dialog,
and On exit sub-menu in other options did not appear.
NEW FEATURES
- If a supported terminal is detected int the $TERM env var,
MikMod will set the title bar with -= MikMod x.x.x =- followed by
the song title between (). There is a configuration option for this
in config->other_options
Summary of changes between MikMod 3.1.6 and MikMod 3.2.0:
================================================================
MikMod 3.2.0 was released on 04/10/2003
THANKS
- Info Saitz <ingo@debian.org>, the debian MikMod package maintainer for many bug fixes.
BUGFIXES
- Bugfixes from the debian MikMod package
+ cleaned up the documentation to match the output of the manpage,
mikmod --help and the actual option processing.
+ Security fix when dealing with archives
+ Won't play LHA-compressed MODs with spaces in their names
+ Support for files with the extension prepended to the filename. Pretty
common on Aminet. Maybe an Amiga convention?
+ Installed new versions of configure.{guess.sub} to support compiling on newer
arches. They are taken from autotools-dev 20030110.1.
NEW FEATURES
- Color ncurse interface, and Option to enable/disable it.
- Option to quit MikMod automatically when the playlist is finished.
Summary of changes between MikMod 3.1.5 and MikMod 3.1.6 (Riom):
================================================================
......
Hello folks !
This is MikMod, version 3.2.4, a module player for Unix.
This is MikMod, version 3.2.5, a module player for Unix.
As usual with each new version, there's a lot of bugfixes and improvements.
Check out the file 'NEWS' for more information.
......
......@@ -14,220 +14,12 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# 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-NOT-FOUND ]]])
dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
dnl LIBMIKMOD_LDADD
dnl
AC_DEFUN([AM_PATH_LIBMIKMOD],
[dnl
dnl Get the cflags and libraries from the libmikmod-config script
dnl
AC_ARG_WITH(libmikmod-prefix,[ --with-libmikmod-prefix=PFX Prefix where libmikmod is installed (optional)],
libmikmod_config_prefix="$withval", libmikmod_config_prefix="")
AC_ARG_WITH(libmikmod-exec-prefix,[ --with-libmikmod-exec-prefix=PFX Exec prefix where libmikmod is installed (optional)],
libmikmod_config_exec_prefix="$withval", libmikmod_config_exec_prefix="")
AC_ARG_ENABLE(libmikmodtest, [ --disable-libmikmodtest Do not try to compile and run a test libmikmod program],
, enable_libmikmodtest=yes)
if test x$libmikmod_config_exec_prefix != x ; then
libmikmod_config_args="$libmikmod_config_args --exec-prefix=$libmikmod_config_exec_prefix"
if test x${LIBMIKMOD_CONFIG+set} != xset ; then
LIBMIKMOD_CONFIG=$libmikmod_config_exec_prefix/bin/libmikmod-config
fi
fi
if test x$libmikmod_config_prefix != x ; then
libmikmod_config_args="$libmikmod_config_args --prefix=$libmikmod_config_prefix"
if test x${LIBMIKMOD_CONFIG+set} != xset ; then
LIBMIKMOD_CONFIG=$libmikmod_config_prefix/bin/libmikmod-config
fi
fi
AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no)
min_libmikmod_version=ifelse([$1], ,3.1.5,$1)
AC_MSG_CHECKING(for libmikmod - version >= $min_libmikmod_version)
no_libmikmod=""
if test "$LIBMIKMOD_CONFIG" = "no" ; then
no_libmikmod=yes
else
LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflags`
LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs`
LIBMIKMOD_LDADD=`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd`
libmikmod_config_major_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
libmikmod_config_minor_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
libmikmod_config_micro_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
if test "x$enable_libmikmodtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
AC_LANG_SAVE
AC_LANG_C
CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD"
LIBS="$LIBMIKMOD_LIBS $LIBS"
dnl
dnl Now check if the installed libmikmod is sufficiently new. (Also sanity
dnl checks the results of libmikmod-config to some extent
dnl
rm -f conf.mikmodtest
AC_TRY_RUN([
#include <mikmod.h>
#include <stdio.h>
#include <stdlib.h>
char* my_strdup (char *str)
{
char *new_str;
if (str) {
new_str = malloc ((strlen (str) + 1) * sizeof(char));
strcpy (new_str, str);
} else
new_str = NULL;
return new_str;
}
int main()
{
int major,minor,micro;
int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
char *tmp_version;
system("touch conf.mikmodtest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_libmikmod_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_libmikmod_version");
exit(1);
}
libmikmod_major_version=(MikMod_GetVersion() >> 16) & 255;
libmikmod_minor_version=(MikMod_GetVersion() >> 8) & 255;
libmikmod_micro_version=(MikMod_GetVersion() ) & 255;
if ((libmikmod_major_version != $libmikmod_config_major_version) ||
(libmikmod_minor_version != $libmikmod_config_minor_version) ||
(libmikmod_micro_version != $libmikmod_config_micro_version))
{
printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but libmikmod (%d.%d.%d)\n",
$libmikmod_config_major_version, $libmikmod_config_minor_version, $libmikmod_config_micro_version,
libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
printf ("*** was found! If libmikmod-config was correct, then it is 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 that is\n");
printf("*** required on your system.\n");
printf("*** If libmikmod-config was wrong, set the environment variable 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");
}
else if ((libmikmod_major_version != LIBMIKMOD_VERSION_MAJOR) ||
(libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) ||
(libmikmod_micro_version != LIBMIKMOD_REVISION))
{
printf("*** libmikmod header files (version %d.%d.%d) do not match\n",
LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION);
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 == major) && (libmikmod_minor_version > minor)) ||
((libmikmod_major_version == major) && (libmikmod_minor_version == minor) && (libmikmod_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\n",
libmikmod_major_version, libmikmod_minor_version, libmikmod_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 version, 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 remove the old version\n");
printf("*** of libmikmod, but you can also set the LIBMIKMOD_CONFIG 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=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
fi
fi
if test "x$no_libmikmod" = x ; then
AC_MSG_RESULT([yes, `$LIBMIKMOD_CONFIG --version`])
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$LIBMIKMOD_CONFIG" = "no" ; then
echo "*** The libmikmod-config script installed by libmikmod could 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 variable 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="$CFLAGS $LIBMIKMOD_CFLAGS"
LIBS="$LIBS $LIBMIKMOD_LIBS"
AC_LANG_SAVE
AC_LANG_C
AC_TRY_LINK([
#include <mikmod.h>
#include <stdio.h>
], [ return (MikMod_GetVersion()!=0); ],
[ echo "*** The test program compiled, but did not run. This usually 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/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 libmikmod was incorrectly installed"
echo "*** or that you have moved libmikmod since it was installed. In the latter case, you"
echo "*** may want to edit the libmikmod-config script: $LIBMIKMOD_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
fi
fi
LIBMIKMOD_CFLAGS=""
LIBMIKMOD_LIBS=""
LIBMIKMOD_LDADD=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(LIBMIKMOD_CFLAGS)
AC_SUBST(LIBMIKMOD_LIBS)
AC_SUBST(LIBMIKMOD_LDADD)
rm -f conf.mikmodtest
])
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
# Foundation, Inc.
#
......@@ -1229,3 +1021,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/ax_define_dir.m4])
m4_include([m4/libmikmod.m4])
This diff is collapsed.
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
# Copyright 1992-2013 Free Software Foundation, Inc.
timestamp='2012-08-18'
timestamp='2013-10-01'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
......@@ -26,11 +20,12 @@ timestamp='2012-08-18'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# the same distribution terms that you use for the rest of that
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted GNU ChangeLog entry.
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
......@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -156,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple | -axis | -knuth | -cray | -microblaze)
-apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
......@@ -259,10 +252,12 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| be32 | be64 \
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
| bfin \
| c4x | clipper \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
......@@ -270,10 +265,11 @@ case $basic_machine in
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
......@@ -291,16 +287,17 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
| mipstx39