1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
Fix audiofile detection
https://bugs.gentoo.org/show_bug.cgi?id=415981
Index: rezound-0.12.3beta/config/m4/audiofile.m4
===================================================================
--- rezound-0.12.3beta.orig/config/m4/audiofile.m4
+++ rezound-0.12.3beta/config/m4/audiofile.m4
@@ -15,108 +15,11 @@ dnl Get compiler flags and libraries fro
dnl
AC_ARG_WITH(audiofile-prefix,AC_HELP_STRING([--with-audiofile-prefix=PFX],[Prefix where Audio File Library is installed (optional)]), audiofile_prefix="$withval", audiofile_prefix="")
AC_ARG_WITH(audiofile-exec-prefix,AC_HELP_STRING([--with-audiofile-exec-prefix=PFX],[Exec prefix where Audio File Library is installed (optional)]), audiofile_exec_prefix="$withval", audiofile_exec_prefix="")
-AC_ARG_ENABLE(audiofiletest,AC_HELP_STRING([--disable-audiofiletest],[Do not try to compile and run a test Audio File Library program]), , enable_audiofiletest=yes)
- if test x$audiofile_exec_prefix != x ; then
- audiofile_args="$audiofile_args --exec-prefix=$audiofile_exec_prefix"
- if test x${AUDIOFILE_CONFIG+set} != xset ; then
- AUDIOFILE_CONFIG=$audiofile_exec_prefix/bin/audiofile-config
- fi
- fi
- if test x$audiofile_prefix != x ; then
- audiofile_args="$audiofile_args --prefix=$audiofile_prefix"
- if test x${AUDIOFILE_CONFIG+set} != xset ; then
- AUDIOFILE_CONFIG=$audiofile_prefix/bin/audiofile-config
- fi
- fi
-
- AC_PATH_PROG(AUDIOFILE_CONFIG, audiofile-config, no)
min_audiofile_version=ifelse([$1], ,0.2.5,$1)
AC_MSG_CHECKING(for Audio File Library - version >= $min_audiofile_version)
no_audiofile=""
- if test "$AUDIOFILE_CONFIG" = "no" ; then
- no_audiofile=yes
- else
- AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs`
- AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags`
- audiofile_major_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- audiofile_minor_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- audiofile_micro_version=`$AUDIOFILE_CONFIG $audiofile_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_audiofiletest" = "xyes" ; then
- AC_LANG_SAVE
- AC_LANG_C
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS"
- LIBS="$LIBS $AUDIOFILE_LIBS"
-dnl
-dnl Now check if the installed Audio File Library is sufficiently new.
-dnl (Also checks the sanity of the results of audiofile-config to some extent.)
-dnl
- rm -f conf.audiofiletest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <audiofile.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;
- char *tmp_version;
-
- system ("touch conf.audiofiletest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_audiofile_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_audiofile_version");
- exit(1);
- }
-
- if (($audiofile_major_version > major) ||
- (($audiofile_major_version == major) && ($audiofile_minor_version > minor)) ||
- (($audiofile_major_version == major) && ($audiofile_minor_version == minor) && ($audiofile_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'audiofile-config --version' returned %d.%d.%d, but the minimum version\n", $audiofile_major_version, $audiofile_minor_version, $audiofile_micro_version);
- printf("*** of the Audio File Library required is %d.%d.%d. If audiofile-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If audiofile-config was wrong, set the environment variable AUDIOFILE_CONFIG\n");
- printf("*** to point to the correct copy of audiofile-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-],, no_audiofile=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- AC_LANG_RESTORE
- fi
- fi
+ PKG_CHECK_MODULES(AUDIOFILE, audiofile >= $min_audiofile_version,no_audiofile="",no_audiofile=yes)
if test "x$no_audiofile" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
|
GitWeb