← Back to branch summary

~clint-fewbar/ubuntu/maverick/apache2/maverick-passphrase-plymouth-change

« back to all changes in this revision

Viewing changes to srclib/apr-util/build/dbd.m4

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Fritsch, Stefan Fritsch, Peter Samuelson
  • Date: 2007-07-01 19:57:51 UTC
  • mfrom: (0.8.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070701195751-kcags6dpm5up3li5
Tags: 2.2.4-1
http://bugs.debian.org/427050
http://bugs.debian.org/410331
http://bugs.debian.org/298689
http://bugs.debian.org/291841
http://bugs.debian.org/431048
http://bugs.debian.org/412580
http://bugs.debian.org/414429
http://bugs.debian.org/419539
http://bugs.debian.org/305933
http://bugs.debian.org/428887
http://bugs.debian.org/415698
http://bugs.debian.org/350822
http://bugs.debian.org/350286
http://bugs.debian.org/384682
http://bugs.debian.org/289289
http://bugs.debian.org/418536
http://bugs.debian.org/399056
http://bugs.debian.org/430116
http://bugs.debian.org/391817
http://bugs.debian.org/431125
[ Stefan Fritsch ]
* Urgency medium for security fix
* Fix CVE-2007-1863: DoS in mod_cache
* New upstream version (Closes: #427050)
  - Fixes "proxy: error reading status line from remote server"
    (Closes: #410331)
* Fix CVE-2007-1862: mod_mem_cache DoS (introduced in 2.2.4)
* Change logrotate script to use reload instead of restart.
  (Closes: #298689)
* chmod o-rx /var/log/apache2 (Closes: #291841)
* chmod o-x suexec (Closes: #431048)
* Update patch for truncated mod_cgi 500 responses from upstream SVN
  (Closes: #412580)
* Don't use AddDefaultCharset for our docs (Closes: #414429)
* fix options syntax in sites-available/default (Closes: #419539)
* Move conf.d include to the end of apache2.conf (Closes: #305933)
* Remove log, cache, and lock files on purge (Closes: #428887)
* Ship /usr/lib/cgi-bin (Closes: #415698)
* Add note to README.Debian how to read docs (Closes: #350822)
* Document pid file name (Closes: #350286)
* Update Standards-Version (no changes needed)
* Fix some lintian warnings, add some overrides
* Start apache when doing a "restart" even if it was not running
  (Closes: #384682)
* reload config in apache2-doc postinst (Closes: #289289)
* don't fail in prerm if apache is not running (Closes: #418536)
* Suggest apache2-doc and www-browser (Closes: #399056)
* Make init script always display a warning if NO_START=1 since
  VERBOSE=yes is not the default anymore (Closes: #430116)
* Replace apache2(8) man page with a more current version
* Add httxt2dbm(8) man page
* Show -X option in help message (Closes: #391817)
* remove sick-hack-to-update-modules
* don't depend on procps on hurd (Closes: #431125)

[ Peter Samuelson ]
* Add shlibs:Depends to apache2.2-common.

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/build/dbd.m4
29
29
  ], [
30
30
    apu_have_pgsql=0
31
31
    if test "$withval" = "yes"; then
32
 
      AC_CHECK_HEADER(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
33
 
      if test "$apu_have_pgsql" == "0"; then
34
 
        AC_CHECK_HEADER(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
35
 
        if test "$apu_have_pgsql" != "0"; then
36
 
          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/postgresql])
37
 
        fi
 
32
      AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
 
33
      if test "$apu_have_pgsql" = "0"; then
 
34
        AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
38
35
      fi
39
36
    elif test "$withval" = "no"; then
40
37
      apu_have_pgsql=0
41
38
    else
42
 
      CPPFLAGS="-I$withval/include"
43
 
      LIBS="-L$withval/lib "
 
39
      old_cppflags="$CPPFLAGS"
 
40
      old_ldflags="$LDFLAGS"
 
41
 
 
42
      pgsql_CPPFLAGS="-I$withval/include"
 
43
      pgsql_LDFLAGS="-L$withval/lib "
 
44
 
 
45
      APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
 
46
      APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
44
47
 
45
48
      AC_MSG_NOTICE(checking for pgsql in $withval)
46
 
      AC_CHECK_HEADER(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
 
49
      AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
47
50
      if test "$apu_have_pgsql" != "0"; then
48
51
        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
49
52
        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
50
53
      fi
51
54
      if test "$apu_have_pgsql" != "1"; then
52
 
        AC_CHECK_HEADER(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
 
55
        AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
53
56
        if test "$apu_have_pgsql" != "0"; then
54
57
          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/postgresql])
55
58
          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
56
59
        fi
57
60
      fi
 
61
 
 
62
      CPPFLAGS="$old_cppflags"
 
63
      LDFLAGS="$old_ldflags"
58
64
    fi
59
65
  ], [
60
66
    apu_have_pgsql=0
61
 
    AC_CHECK_HEADER(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
 
67
    AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
62
68
  ])
63
69
  AC_SUBST(apu_have_pgsql)
64
70
  dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
72
78
AC_DEFUN([APU_CHECK_DBD_MYSQL], [
73
79
  apu_have_mysql=0
74
80
 
75
 
  AC_ARG_WITH([mysql], [
76
 
  --with-mysql=DIR          **** SEE INSTALL.MySQL ****
77
 
  ], [
78
 
    apu_have_mysql=0
79
 
    if test "$withval" = "yes"; then
80
 
      AC_CHECK_HEADER(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
81
 
      if test "$apu_have_mysql" == "0"; then
82
 
        AC_CHECK_HEADER(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
 
81
  AC_CHECK_FILES([dbd/apr_dbd_mysql.c],[
 
82
    AC_ARG_WITH([mysql], [
 
83
    --with-mysql=DIR          **** SEE INSTALL.MySQL ****
 
84
    ], [
 
85
      apu_have_mysql=0
 
86
      if test "$withval" = "yes"; then
 
87
        old_cppflags="$CPPFLAGS"
 
88
        old_ldflags="$LDFLAGS"
 
89
 
 
90
        AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
 
91
        if test "x$MYSQL_CONFIG" != 'x'; then
 
92
          mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
 
93
          mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
 
94
 
 
95
          APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
 
96
          APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS])
 
97
        fi
 
98
 
 
99
        AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
 
100
        if test "$apu_have_mysql" = "0"; then
 
101
          AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
 
102
        else
 
103
          if test "x$MYSQL_CONFIG" != 'x'; then
 
104
            APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
 
105
            APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
 
106
          fi
 
107
        fi
 
108
 
 
109
        CPPFLAGS="$old_cppflags"
 
110
        LDFLAGS="$old_ldflags"
 
111
      elif test "$withval" = "no"; then
 
112
        apu_have_mysql=0
 
113
      else
 
114
        old_cppflags="$CPPFLAGS"
 
115
        old_ldflags="$LDFLAGS"
 
116
 
 
117
        AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
 
118
        if test "x$MYSQL_CONFIG" != 'x'; then
 
119
          mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
 
120
          mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
 
121
        else
 
122
          mysql_CPPFLAGS="-I$withval/include"
 
123
          mysql_LDFLAGS="-L$withval/lib "
 
124
        fi
 
125
 
 
126
        APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
 
127
        APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS])
 
128
 
 
129
        AC_MSG_NOTICE(checking for mysql in $withval)
 
130
        AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
83
131
        if test "$apu_have_mysql" != "0"; then
84
 
          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/myql])
85
 
        fi
 
132
          APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
 
133
          APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
 
134
        fi
 
135
 
 
136
        if test "$apu_have_mysql" != "1"; then
 
137
          AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
 
138
          if test "$apu_have_mysql" != "0"; then
 
139
            APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
 
140
            APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
 
141
          fi
 
142
        fi
 
143
 
 
144
        CPPFLAGS="$old_cppflags"
 
145
        LDFLAGS="$old_ldflags"
86
146
      fi
87
 
    elif test "$withval" = "no"; then
 
147
    ], [
88
148
      apu_have_mysql=0
89
 
    else
90
 
      CPPFLAGS="-I$withval/include"
91
 
      LIBS="-L$withval/lib "
92
 
 
93
 
      AC_MSG_NOTICE(checking for mysql in $withval)
94
 
      AC_CHECK_HEADER(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
 
149
 
 
150
      old_cppflags="$CPPFLAGS"
 
151
      old_ldflags="$LDFLAGS"
 
152
 
 
153
      AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
 
154
      if test "x$MYSQL_CONFIG" != 'x'; then
 
155
        mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
 
156
        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
 
157
 
 
158
        APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
 
159
        APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS])
 
160
      fi
 
161
 
 
162
      AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
 
163
 
95
164
      if test "$apu_have_mysql" != "0"; then
96
 
        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
97
 
        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
98
 
      fi
99
 
 
100
 
      if test "$apu_have_mysql" != "1"; then
101
 
        AC_CHECK_HEADER(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
102
 
        if test "$apu_have_mysql" != "0"; then
103
 
          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
104
 
          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
 
165
        if test "x$MYSQL_CONFIG" != 'x'; then
 
166
          APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
 
167
          APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
105
168
        fi
106
169
      fi
107
 
    fi
108
 
  ], [
109
 
    apu_have_mysql=0
110
 
    AC_CHECK_HEADER(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
 
170
 
 
171
      CPPFLAGS="$old_cppflags"
 
172
      LDFLAGS="$old_ldflags"
 
173
    ])
111
174
  ])
112
175
 
113
176
  AC_SUBST(apu_have_mysql)
128
191
  ], [
129
192
    apu_have_sqlite3=0
130
193
    if test "$withval" = "yes"; then
131
 
      AC_CHECK_HEADER(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
 
194
      AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
132
195
    elif test "$withval" = "no"; then
133
196
      apu_have_sqlite3=0
134
197
    else
135
 
      CPPFLAGS="-I$withval/include"
136
 
      LIBS="-L$withval/lib "
 
198
      old_cppflags="$CPPFLAGS"
 
199
      old_ldflags="$LDFLAGS"
 
200
 
 
201
      sqlite3_CPPFLAGS="-I$withval/include"
 
202
      sqlite3_LDFLAGS="-L$withval/lib "
 
203
 
 
204
      APR_ADDTO(CPPFLAGS, [$sqlite3_CPPFLAGS])
 
205
      APR_ADDTO(LDFLAGS, [$sqlite3_LDFLAGS])
137
206
 
138
207
      AC_MSG_NOTICE(checking for sqlite3 in $withval)
139
 
      AC_CHECK_HEADER(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
 
208
      AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
140
209
      if test "$apu_have_sqlite3" != "0"; then
141
210
        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
142
211
        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
143
212
      fi
 
213
 
 
214
      CPPFLAGS="$old_cppflags"
 
215
      LDFLAGS="$old_ldflags"
144
216
    fi
145
217
  ], [
146
218
    apu_have_sqlite3=0
147
 
    AC_CHECK_HEADER(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
 
219
    AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
148
220
  ])
149
221
 
150
222
  AC_SUBST(apu_have_sqlite3)
165
237
  ], [
166
238
    apu_have_sqlite2=0
167
239
    if test "$withval" = "yes"; then
168
 
      AC_CHECK_HEADER(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
 
240
      AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
169
241
    elif test "$withval" = "no"; then
170
242
      apu_have_sqlite2=0
171
243
    else
172
 
      CPPFLAGS="-I$withval/include"
173
 
      LIBS="-L$withval/lib "
 
244
      old_cppflags="$CPPFLAGS"
 
245
      old_ldflags="$LDFLAGS"
 
246
 
 
247
      sqlite2_CPPFLAGS="-I$withval/include"
 
248
      sqlite2_LDFLAGS="-L$withval/lib "
 
249
 
 
250
      APR_ADDTO(CPPFLAGS, [$sqlite2_CPPFLAGS])
 
251
      APR_ADDTO(LDFLAGS, [$sqlite2_LDFLAGS])
174
252
 
175
253
      AC_MSG_NOTICE(checking for sqlite2 in $withval)
176
 
      AC_CHECK_HEADER(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
 
254
      AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
177
255
      if test "$apu_have_sqlite2" != "0"; then
178
256
        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
179
257
        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
180
258
      fi
 
259
 
 
260
      CPPFLAGS="$old_cppflags"
 
261
      LDFLAGS="$old_ldflags"
181
262
    fi
182
263
  ], [
183
264
    apu_have_sqlite2=0
184
 
    AC_CHECK_HEADER(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
 
265
    AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
185
266
  ])
186
267
 
187
268
  AC_SUBST(apu_have_sqlite2)