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
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
Description: Fix FTCBFS: multiple configure issues
Author: Helmut Grohne <helmut@subdivi.de>
Last-Update: 2024-10-20
Bug-Debian: https://bugs.debian.org/1085503
--- libapache-mod-musicindex-1.4.1.orig/configure.ac
+++ libapache-mod-musicindex-1.4.1/configure.ac
@@ -85,75 +85,46 @@
AC_SUBST(APXS_INCLUDE)
AC_MSG_CHECKING([for which version of Apache we should build])
-
-################################
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $APXS_INCLUDE"
-cat >conftest.$ac_ext <<_ACEOF
-#include <stdio.h>
-#include <ap_mmn.h>
-
-int main(void)
-{
-#if (MODULE_MAGIC_COOKIE == 0x41503133UL)
- printf("AP13\n");
-#elif (MODULE_MAGIC_COOKIE == 0x41503230UL)
- printf("AP20\n");
-#elif (MODULE_MAGIC_COOKIE == 0x41503232UL)
- printf("AP22\n");
-#elif (MODULE_MAGIC_COOKIE == 0x41503234UL)
- printf("AP24\n");
-#endif
-}
-_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
- apache_version=`./conftest$ac_exeext`
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mad_mad_bit_init=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+AC_COMPUTE_INT([apache_version_magic],[MODULE_MAGIC_COOKIE],[#include <ap_mmn.h>])
CFLAGS=$ac_save_CFLAGS
-################################
+
+AC_MSG_RESULT([:$apache_version_magic:])
+case "$apache_version_magic" in
+ 1095774515)
+ apache_version=AP13
+ ;;
+ 1095774768)
+ apache_version=AP20
+ AC_DEFINE([AP20], [], ["AP20"])
+ ;;
+ 1095774770)
+ apache_version=AP22
+ AC_DEFINE([AP22], [], ["AP22"])
+ ;;
+ 1095774772)
+ apache_version=AP24
+ AC_DEFINE([AP24], [], ["AP24"])
+ ;;
+esac
AC_MSG_RESULT([${apache_version}])
+PKG_CHECK_MODULES([APR],[apr-1],[
+ AC_DEFINE([BUILD_FOR_APACHE2], [], ["apache2"])
+ AM_CONDITIONAL(BUILD_FOR_APACHE2, true)
+ APR_INCLUDE=
+ AC_SUBST(APR_INCLUDE)
+ APR_CPPFLAGS=
+ AC_SUBST(APR_CPPFLAGS)
+],[
if test x$apache_version = xAP20; then
AC_CHECK_PROG(APR_CONFIG, apr-config, apr-config, [], [], [exit1])
- AC_DEFINE([AP20], [], ["AP20"])
fi
-if test x$apache_version = xAP22; then
- AC_CHECK_PROG(APR_CONFIG, apr-1-config, apr-1-config, [], [], [exit1])
- AC_DEFINE([AP22], [], ["AP22"])
-fi
-
-if test x$apache_version = xAP24; then
+if test x$apache_version = xAP22 || test x$apache_version = AP24; then
AC_CHECK_PROG(APR_CONFIG, apr-1-config, apr-1-config, [], [], [exit1])
- AC_DEFINE([AP24], [], ["AP24"])
fi
if test "x$APR_CONFIG" != "x"; then
@@ -173,6 +144,7 @@
else
AM_CONDITIONAL(BUILD_FOR_APACHE2, false)
fi
+])
# Checks for libraries.
##########################################################################
@@ -306,16 +278,20 @@
##########################################################################
-#check if the user has a prefered mysql_config tool. by default, use mysql_config
+#check if the user has a prefered mysql_config tool. by default, use pkg-config
AC_ARG_WITH([mysql_config],
AC_HELP_STRING([--with-mysql_config=ARG], [mysql_config executable]),
[MYSQL_CONFIG="${withval}"],
- [MYSQL_CONFIG="mysql_config"])
+ [MYSQL_CONFIG="pkg-config"])
+
+AS_IF([test "x$MYSQL_CONFIG" = xpkg-config],[
+ PKG_CHECK_MODULES([MYSQL],[mysqlclient],[],[MYSQL_CONFIG="mysql_config"])
+])
#check if the mysql_config tool actually exists
-if test x$MYSQL_CONFIG != xnone; then
+AS_IF([test "x$MYSQL_CONFIG" != xnone && test "x$MYSQL_CONFIG" != xpkg-config],[
AC_PATH_PROG([MYSQL_CONFIG], [$MYSQL_CONFIG], [], [$PATH:/usr/sbin:/usr/local/bin])
-fi
+])
AC_ARG_ENABLE([mysqlcache],
AC_HELP_STRING([--disable-mysqlcache], [MySQL cache support]),
@@ -330,11 +306,15 @@
mysqlcache=false
fi
-if test x$mysqlcache = xtrue; then
+if test "x$mysqlcache" = xtrue && test "x$MYSQL_CONFIG" != xpkg-config; then
MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
MYSQL_LIBS="`$MYSQL_CONFIG --libs`"
MYSQL_INCLUDE="`$MYSQL_CONFIG --include`"
fi
+if test "x$mysqlcache" = xfalse; then
+ MYSQL_CFLAGS=
+ MYSQL_LIBS=
+fi
AC_SUBST(MYSQL_CFLAGS)
AC_SUBST(MYSQL_LIBS)
|
