memcached 1.3.3 → 1.3.4
Sign up to get free protection for your applications and to get access to all the features.
- data.tar.gz.sig +2 -3
- data/CHANGELOG +2 -0
- data/ext/libmemcached-0.32/Makefile.in +9 -8
- data/ext/libmemcached-0.32/aclocal.m4 +213 -49
- data/ext/libmemcached-0.32/clients/Makefile.am +11 -4
- data/ext/libmemcached-0.32/clients/Makefile.in +27 -26
- data/ext/libmemcached-0.32/config.h.in +2 -2
- data/ext/libmemcached-0.32/configure +677 -542
- data/ext/libmemcached-0.32/docs/Makefile.in +1 -1
- data/ext/libmemcached-0.32/libmemcached/Makefile.am +1 -2
- data/ext/libmemcached-0.32/libmemcached/Makefile.in +15 -14
- data/ext/libmemcached-0.32/libmemcached/memcached_connect.c +14 -4
- data/ext/libmemcached-0.32/libmemcachedutil/Makefile.in +1 -1
- data/ext/libmemcached-0.32/m4/pandora_have_sasl.m4 +1 -1
- data/ext/libmemcached-0.32/support/Makefile.in +1 -1
- data/ext/libmemcached-0.32/tests/Makefile.am +8 -0
- data/ext/libmemcached-0.32/tests/Makefile.in +23 -11
- data/memcached.gemspec +2 -2
- metadata +2 -2
- metadata.gz.sig +0 -0
data.tar.gz.sig
CHANGED
@@ -1,3 +1,2 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
롉
|
1
|
+
є��X�ȎK�`WД%bWx�1*��F4�����4�BKt��˶1P��A�]Դ
|
2
|
+
^C#2
|
data/CHANGELOG
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Makefile.in generated by automake 1.11 from Makefile.am.
|
1
|
+
# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
2
2
|
# @configure_input@
|
3
3
|
|
4
4
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
@@ -367,7 +367,7 @@ distclean-libtool:
|
|
367
367
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
368
368
|
# (2) otherwise, pass the desired values on the `make' command line.
|
369
369
|
$(RECURSIVE_TARGETS):
|
370
|
-
@failcom='exit 1'; \
|
370
|
+
@fail= failcom='exit 1'; \
|
371
371
|
for f in x $$MAKEFLAGS; do \
|
372
372
|
case $$f in \
|
373
373
|
*=* | --[!k]*);; \
|
@@ -392,7 +392,7 @@ $(RECURSIVE_TARGETS):
|
|
392
392
|
fi; test -z "$$fail"
|
393
393
|
|
394
394
|
$(RECURSIVE_CLEAN_TARGETS):
|
395
|
-
@failcom='exit 1'; \
|
395
|
+
@fail= failcom='exit 1'; \
|
396
396
|
for f in x $$MAKEFLAGS; do \
|
397
397
|
case $$f in \
|
398
398
|
*=* | --[!k]*);; \
|
@@ -556,7 +556,8 @@ distdir: $(DISTFILES)
|
|
556
556
|
fi; \
|
557
557
|
done
|
558
558
|
-test -n "$(am__skip_mode_fix)" \
|
559
|
-
|| find "$(distdir)" -type d ! -perm -
|
559
|
+
|| find "$(distdir)" -type d ! -perm -755 \
|
560
|
+
-exec chmod u+rwx,go+rx {} \; -o \
|
560
561
|
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
561
562
|
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
562
563
|
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
@@ -600,17 +601,17 @@ dist dist-all: distdir
|
|
600
601
|
distcheck: dist
|
601
602
|
case '$(DIST_ARCHIVES)' in \
|
602
603
|
*.tar.gz*) \
|
603
|
-
GZIP=$(GZIP_ENV)
|
604
|
+
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
604
605
|
*.tar.bz2*) \
|
605
|
-
|
606
|
+
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
606
607
|
*.tar.lzma*) \
|
607
|
-
|
608
|
+
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
|
608
609
|
*.tar.xz*) \
|
609
610
|
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
610
611
|
*.tar.Z*) \
|
611
612
|
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
612
613
|
*.shar.gz*) \
|
613
|
-
GZIP=$(GZIP_ENV)
|
614
|
+
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
614
615
|
*.zip*) \
|
615
616
|
unzip $(distdir).zip ;;\
|
616
617
|
esac
|
@@ -1,4 +1,4 @@
|
|
1
|
-
# generated automatically by aclocal 1.11 -*- Autoconf -*-
|
1
|
+
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
|
2
2
|
|
3
3
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
4
4
|
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
@@ -13,14 +13,14 @@
|
|
13
13
|
|
14
14
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
15
15
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
16
|
-
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.
|
17
|
-
[m4_warning([this file was generated for autoconf 2.
|
16
|
+
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
|
17
|
+
[m4_warning([this file was generated for autoconf 2.68.
|
18
18
|
You have another version of autoconf. It may work, but is not guaranteed to.
|
19
19
|
If you have problems, you may need to regenerate the build system entirely.
|
20
20
|
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
21
21
|
|
22
|
-
# lib-ld.m4 serial
|
23
|
-
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
|
22
|
+
# lib-ld.m4 serial 4 (gettext-0.18)
|
23
|
+
dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
|
24
24
|
dnl This file is free software; the Free Software Foundation
|
25
25
|
dnl gives unlimited permission to copy and/or distribute it,
|
26
26
|
dnl with or without modifications, as long as this notice is preserved.
|
@@ -31,7 +31,7 @@ dnl with libtool.m4.
|
|
31
31
|
|
32
32
|
dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
|
33
33
|
AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
34
|
-
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
|
34
|
+
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
|
35
35
|
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
36
36
|
case `$LD -v 2>&1 </dev/null` in
|
37
37
|
*GNU* | *'with BFD'*)
|
@@ -44,7 +44,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
44
44
|
|
45
45
|
dnl From libtool-1.4. Sets the variable LD.
|
46
46
|
AC_DEFUN([AC_LIB_PROG_LD],
|
47
|
-
[AC_ARG_WITH(gnu-ld,
|
47
|
+
[AC_ARG_WITH([gnu-ld],
|
48
48
|
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
49
49
|
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
50
50
|
AC_REQUIRE([AC_PROG_CC])dnl
|
@@ -80,7 +80,7 @@ if test "$GCC" = yes; then
|
|
80
80
|
# Canonicalize the path of ld
|
81
81
|
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
82
82
|
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
83
|
-
|
83
|
+
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
84
84
|
done
|
85
85
|
test -z "$LD" && LD="$ac_prog"
|
86
86
|
;;
|
@@ -98,7 +98,7 @@ elif test "$with_gnu_ld" = yes; then
|
|
98
98
|
else
|
99
99
|
AC_MSG_CHECKING([for non-GNU ld])
|
100
100
|
fi
|
101
|
-
AC_CACHE_VAL(acl_cv_path_LD,
|
101
|
+
AC_CACHE_VAL([acl_cv_path_LD],
|
102
102
|
[if test -z "$LD"; then
|
103
103
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
104
104
|
for ac_dir in $PATH; do
|
@@ -110,9 +110,9 @@ AC_CACHE_VAL(acl_cv_path_LD,
|
|
110
110
|
# Break only if it was the GNU/non-GNU ld that we prefer.
|
111
111
|
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
|
112
112
|
*GNU* | *'with BFD'*)
|
113
|
-
|
113
|
+
test "$with_gnu_ld" != no && break ;;
|
114
114
|
*)
|
115
|
-
|
115
|
+
test "$with_gnu_ld" != yes && break ;;
|
116
116
|
esac
|
117
117
|
fi
|
118
118
|
done
|
@@ -122,23 +122,23 @@ else
|
|
122
122
|
fi])
|
123
123
|
LD="$acl_cv_path_LD"
|
124
124
|
if test -n "$LD"; then
|
125
|
-
AC_MSG_RESULT($LD)
|
125
|
+
AC_MSG_RESULT([$LD])
|
126
126
|
else
|
127
|
-
AC_MSG_RESULT(no)
|
127
|
+
AC_MSG_RESULT([no])
|
128
128
|
fi
|
129
129
|
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
130
130
|
AC_LIB_PROG_LD_GNU
|
131
131
|
])
|
132
132
|
|
133
|
-
# lib-link.m4 serial
|
134
|
-
dnl Copyright (C) 2001-
|
133
|
+
# lib-link.m4 serial 21 (gettext-0.18)
|
134
|
+
dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
|
135
135
|
dnl This file is free software; the Free Software Foundation
|
136
136
|
dnl gives unlimited permission to copy and/or distribute it,
|
137
137
|
dnl with or without modifications, as long as this notice is preserved.
|
138
138
|
|
139
139
|
dnl From Bruno Haible.
|
140
140
|
|
141
|
-
AC_PREREQ(2.54)
|
141
|
+
AC_PREREQ([2.54])
|
142
142
|
|
143
143
|
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
144
144
|
dnl the libraries corresponding to explicit and implicit dependencies.
|
@@ -150,9 +150,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
|
|
150
150
|
[
|
151
151
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
152
152
|
AC_REQUIRE([AC_LIB_RPATH])
|
153
|
-
|
154
|
-
|
155
|
-
|
153
|
+
pushdef([Name],[translit([$1],[./-], [___])])
|
154
|
+
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
155
|
+
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
156
156
|
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
|
157
157
|
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
158
158
|
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
|
@@ -171,16 +171,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
|
|
171
171
|
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
|
172
172
|
dnl results of this search when this library appears as a dependency.
|
173
173
|
HAVE_LIB[]NAME=yes
|
174
|
-
|
175
|
-
|
174
|
+
popdef([NAME])
|
175
|
+
popdef([Name])
|
176
176
|
])
|
177
177
|
|
178
|
-
dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
|
178
|
+
dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
|
179
179
|
dnl searches for libname and the libraries corresponding to explicit and
|
180
180
|
dnl implicit dependencies, together with the specified include files and
|
181
|
-
dnl the ability to compile and link the specified testcode.
|
182
|
-
dnl
|
183
|
-
dnl
|
181
|
+
dnl the ability to compile and link the specified testcode. The missing-message
|
182
|
+
dnl defaults to 'no' and may contain additional hints for the user.
|
183
|
+
dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
|
184
|
+
dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
|
184
185
|
dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
|
185
186
|
dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
|
186
187
|
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
|
@@ -189,9 +190,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
|
189
190
|
[
|
190
191
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
191
192
|
AC_REQUIRE([AC_LIB_RPATH])
|
192
|
-
|
193
|
-
|
194
|
-
|
193
|
+
pushdef([Name],[translit([$1],[./-], [___])])
|
194
|
+
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
195
|
+
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
195
196
|
|
196
197
|
dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
|
197
198
|
dnl accordingly.
|
@@ -205,13 +206,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
|
205
206
|
|
206
207
|
AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
|
207
208
|
ac_save_LIBS="$LIBS"
|
208
|
-
|
209
|
-
|
209
|
+
dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
|
210
|
+
dnl because these -l options might require -L options that are present in
|
211
|
+
dnl LIBS. -l options benefit only from the -L options listed before it.
|
212
|
+
dnl Otherwise, add it to the front of LIBS, because it may be a static
|
213
|
+
dnl library that depends on another static library that is present in LIBS.
|
214
|
+
dnl Static libraries benefit only from the static libraries listed after
|
215
|
+
dnl it.
|
216
|
+
case " $LIB[]NAME" in
|
217
|
+
*" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
|
218
|
+
*) LIBS="$LIB[]NAME $LIBS" ;;
|
219
|
+
esac
|
220
|
+
AC_TRY_LINK([$3], [$4],
|
221
|
+
[ac_cv_lib[]Name=yes],
|
222
|
+
[ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
|
210
223
|
LIBS="$ac_save_LIBS"
|
211
224
|
])
|
212
225
|
if test "$ac_cv_lib[]Name" = yes; then
|
213
226
|
HAVE_LIB[]NAME=yes
|
214
|
-
AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
|
227
|
+
AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
|
215
228
|
AC_MSG_CHECKING([how to link with lib[]$1])
|
216
229
|
AC_MSG_RESULT([$LIB[]NAME])
|
217
230
|
else
|
@@ -227,8 +240,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
|
227
240
|
AC_SUBST([LIB]NAME)
|
228
241
|
AC_SUBST([LTLIB]NAME)
|
229
242
|
AC_SUBST([LIB]NAME[_PREFIX])
|
230
|
-
|
231
|
-
|
243
|
+
popdef([NAME])
|
244
|
+
popdef([Name])
|
232
245
|
])
|
233
246
|
|
234
247
|
dnl Determine the platform dependent parameters needed to use rpath:
|
@@ -246,7 +259,7 @@ AC_DEFUN([AC_LIB_RPATH],
|
|
246
259
|
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
247
260
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
248
261
|
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
|
249
|
-
AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
|
262
|
+
AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
|
250
263
|
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
251
264
|
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
252
265
|
. ./conftest.sh
|
@@ -263,11 +276,32 @@ AC_DEFUN([AC_LIB_RPATH],
|
|
263
276
|
acl_hardcode_direct="$acl_cv_hardcode_direct"
|
264
277
|
acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
265
278
|
dnl Determine whether the user wants rpath handling at all.
|
266
|
-
AC_ARG_ENABLE(rpath,
|
279
|
+
AC_ARG_ENABLE([rpath],
|
267
280
|
[ --disable-rpath do not hardcode runtime library paths],
|
268
281
|
:, enable_rpath=yes)
|
269
282
|
])
|
270
283
|
|
284
|
+
dnl AC_LIB_FROMPACKAGE(name, package)
|
285
|
+
dnl declares that libname comes from the given package. The configure file
|
286
|
+
dnl will then not have a --with-libname-prefix option but a
|
287
|
+
dnl --with-package-prefix option. Several libraries can come from the same
|
288
|
+
dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
|
289
|
+
dnl macro call that searches for libname.
|
290
|
+
AC_DEFUN([AC_LIB_FROMPACKAGE],
|
291
|
+
[
|
292
|
+
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
293
|
+
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
294
|
+
define([acl_frompackage_]NAME, [$2])
|
295
|
+
popdef([NAME])
|
296
|
+
pushdef([PACK],[$2])
|
297
|
+
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
|
298
|
+
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
299
|
+
define([acl_libsinpackage_]PACKUP,
|
300
|
+
m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
|
301
|
+
popdef([PACKUP])
|
302
|
+
popdef([PACK])
|
303
|
+
])
|
304
|
+
|
271
305
|
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
|
272
306
|
dnl the libraries corresponding to explicit and implicit dependencies.
|
273
307
|
dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
|
@@ -276,19 +310,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
|
276
310
|
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
277
311
|
[
|
278
312
|
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
279
|
-
|
280
|
-
|
313
|
+
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
314
|
+
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
315
|
+
pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
|
316
|
+
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
|
317
|
+
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
318
|
+
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
|
281
319
|
dnl Autoconf >= 2.61 supports dots in --with options.
|
282
|
-
|
320
|
+
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
|
283
321
|
dnl By default, look in $includedir and $libdir.
|
284
322
|
use_additional=yes
|
285
323
|
AC_LIB_WITH_FINAL_PREFIX([
|
286
324
|
eval additional_includedir=\"$includedir\"
|
287
325
|
eval additional_libdir=\"$libdir\"
|
288
326
|
])
|
289
|
-
|
290
|
-
[ --with-
|
291
|
-
--without-
|
327
|
+
AC_ARG_WITH(P_A_C_K[-prefix],
|
328
|
+
[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
|
329
|
+
--without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
|
292
330
|
[
|
293
331
|
if test "X$withval" = "Xno"; then
|
294
332
|
use_additional=no
|
@@ -301,6 +339,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
301
339
|
else
|
302
340
|
additional_includedir="$withval/include"
|
303
341
|
additional_libdir="$withval/$acl_libdirstem"
|
342
|
+
if test "$acl_libdirstem2" != "$acl_libdirstem" \
|
343
|
+
&& ! test -d "$withval/$acl_libdirstem"; then
|
344
|
+
additional_libdir="$withval/$acl_libdirstem2"
|
345
|
+
fi
|
304
346
|
fi
|
305
347
|
fi
|
306
348
|
])
|
@@ -310,6 +352,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
310
352
|
LTLIB[]NAME=
|
311
353
|
INC[]NAME=
|
312
354
|
LIB[]NAME[]_PREFIX=
|
355
|
+
dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
|
356
|
+
dnl computed. So it has to be reset here.
|
357
|
+
HAVE_LIB[]NAME=
|
313
358
|
rpathdirs=
|
314
359
|
ltrpathdirs=
|
315
360
|
names_already_handled=
|
@@ -459,7 +504,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
459
504
|
dnl Linking with a shared library. We attempt to hardcode its
|
460
505
|
dnl directory into the executable's runpath, unless it's the
|
461
506
|
dnl standard /usr/lib.
|
462
|
-
if test "$enable_rpath" = no
|
507
|
+
if test "$enable_rpath" = no \
|
508
|
+
|| test "X$found_dir" = "X/usr/$acl_libdirstem" \
|
509
|
+
|| test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
|
463
510
|
dnl No hardcoding is needed.
|
464
511
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
465
512
|
else
|
@@ -547,7 +594,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
547
594
|
case "$found_dir" in
|
548
595
|
*/$acl_libdirstem | */$acl_libdirstem/)
|
549
596
|
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
|
550
|
-
|
597
|
+
if test "$name" = '$1'; then
|
598
|
+
LIB[]NAME[]_PREFIX="$basedir"
|
599
|
+
fi
|
600
|
+
additional_includedir="$basedir/include"
|
601
|
+
;;
|
602
|
+
*/$acl_libdirstem2 | */$acl_libdirstem2/)
|
603
|
+
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
|
604
|
+
if test "$name" = '$1'; then
|
605
|
+
LIB[]NAME[]_PREFIX="$basedir"
|
606
|
+
fi
|
551
607
|
additional_includedir="$basedir/include"
|
552
608
|
;;
|
553
609
|
esac
|
@@ -608,9 +664,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
608
664
|
dnl 3. if it's already present in $LDFLAGS or the already
|
609
665
|
dnl constructed $LIBNAME,
|
610
666
|
dnl 4. if it doesn't exist as a directory.
|
611
|
-
if test "X$additional_libdir" != "X/usr/$acl_libdirstem"
|
667
|
+
if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
|
668
|
+
&& test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
|
612
669
|
haveit=
|
613
|
-
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"
|
670
|
+
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
|
671
|
+
|| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
|
614
672
|
if test -n "$GCC"; then
|
615
673
|
case $host_os in
|
616
674
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
@@ -741,6 +799,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
741
799
|
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
|
742
800
|
done
|
743
801
|
fi
|
802
|
+
popdef([P_A_C_K])
|
803
|
+
popdef([PACKLIBS])
|
804
|
+
popdef([PACKUP])
|
805
|
+
popdef([PACK])
|
806
|
+
popdef([NAME])
|
744
807
|
])
|
745
808
|
|
746
809
|
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
|
@@ -786,7 +849,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
|
|
786
849
|
if test -n "$next"; then
|
787
850
|
dir="$next"
|
788
851
|
dnl No need to hardcode the standard /usr/lib.
|
789
|
-
if test "X$dir" != "X/usr/$acl_libdirstem"
|
852
|
+
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
853
|
+
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
790
854
|
rpathdirs="$rpathdirs $dir"
|
791
855
|
fi
|
792
856
|
next=
|
@@ -795,7 +859,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
|
|
795
859
|
-L) next=yes ;;
|
796
860
|
-L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
|
797
861
|
dnl No need to hardcode the standard /usr/lib.
|
798
|
-
if test "X$dir" != "X/usr/$acl_libdirstem"
|
862
|
+
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
863
|
+
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
799
864
|
rpathdirs="$rpathdirs $dir"
|
800
865
|
fi
|
801
866
|
next= ;;
|
@@ -840,6 +905,105 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
|
|
840
905
|
AC_SUBST([$1])
|
841
906
|
])
|
842
907
|
|
908
|
+
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
909
|
+
#
|
910
|
+
# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
|
911
|
+
# Written by Scott James Remnant, 2004.
|
912
|
+
#
|
913
|
+
# This file is free software; the Free Software Foundation gives
|
914
|
+
# unlimited permission to copy and/or distribute it, with or without
|
915
|
+
# modifications, as long as this notice is preserved.
|
916
|
+
|
917
|
+
# serial 5 lt~obsolete.m4
|
918
|
+
|
919
|
+
# These exist entirely to fool aclocal when bootstrapping libtool.
|
920
|
+
#
|
921
|
+
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
|
922
|
+
# which have later been changed to m4_define as they aren't part of the
|
923
|
+
# exported API, or moved to Autoconf or Automake where they belong.
|
924
|
+
#
|
925
|
+
# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
|
926
|
+
# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
|
927
|
+
# using a macro with the same name in our local m4/libtool.m4 it'll
|
928
|
+
# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
|
929
|
+
# and doesn't know about Autoconf macros at all.)
|
930
|
+
#
|
931
|
+
# So we provide this file, which has a silly filename so it's always
|
932
|
+
# included after everything else. This provides aclocal with the
|
933
|
+
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
|
934
|
+
# because those macros already exist, or will be overwritten later.
|
935
|
+
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
|
936
|
+
#
|
937
|
+
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
|
938
|
+
# Yes, that means every name once taken will need to remain here until
|
939
|
+
# we give up compatibility with versions before 1.7, at which point
|
940
|
+
# we need to keep only those names which we still refer to.
|
941
|
+
|
942
|
+
# This is to help aclocal find these macros, as it can't see m4_define.
|
943
|
+
AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
|
944
|
+
|
945
|
+
m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
|
946
|
+
m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
|
947
|
+
m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
|
948
|
+
m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
|
949
|
+
m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
|
950
|
+
m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
|
951
|
+
m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
|
952
|
+
m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
|
953
|
+
m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
|
954
|
+
m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
|
955
|
+
m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
|
956
|
+
m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
|
957
|
+
m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
|
958
|
+
m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
|
959
|
+
m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
|
960
|
+
m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
|
961
|
+
m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
|
962
|
+
m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
|
963
|
+
m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
|
964
|
+
m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
|
965
|
+
m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
|
966
|
+
m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
|
967
|
+
m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
|
968
|
+
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
|
969
|
+
m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
|
970
|
+
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
|
971
|
+
m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
|
972
|
+
m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
|
973
|
+
m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
|
974
|
+
m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
|
975
|
+
m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
|
976
|
+
m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
|
977
|
+
m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
|
978
|
+
m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
|
979
|
+
m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
|
980
|
+
m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
|
981
|
+
m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
|
982
|
+
m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
|
983
|
+
m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
|
984
|
+
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
|
985
|
+
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
|
986
|
+
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
|
987
|
+
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
|
988
|
+
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
|
989
|
+
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
|
990
|
+
m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
|
991
|
+
m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
|
992
|
+
m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
|
993
|
+
m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
|
994
|
+
m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
|
995
|
+
m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
|
996
|
+
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
|
997
|
+
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
|
998
|
+
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
|
999
|
+
m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
|
1000
|
+
m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
|
1001
|
+
m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
|
1002
|
+
m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
|
1003
|
+
m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
|
1004
|
+
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
|
1005
|
+
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
1006
|
+
|
843
1007
|
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
844
1008
|
#
|
845
1009
|
# This file is free software; the Free Software Foundation
|
@@ -855,7 +1019,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|
855
1019
|
[am__api_version='1.11'
|
856
1020
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
857
1021
|
dnl require some minimum version. Point them to the right macro.
|
858
|
-
m4_if([$1], [1.11], [],
|
1022
|
+
m4_if([$1], [1.11.1], [],
|
859
1023
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
860
1024
|
])
|
861
1025
|
|
@@ -871,7 +1035,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|
871
1035
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
872
1036
|
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
873
1037
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
874
|
-
[AM_AUTOMAKE_VERSION([1.11])dnl
|
1038
|
+
[AM_AUTOMAKE_VERSION([1.11.1])dnl
|
875
1039
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
876
1040
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
877
1041
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|