0025-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch 78 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531153215331534153515361537153815391540154115421543154415451546154715481549155015511552155315541555155615571558155915601561156215631564156515661567156815691570157115721573157415751576157715781579158015811582158315841585158615871588158915901591159215931594159515961597159815991600160116021603160416051606160716081609161016111612161316141615161616171618161916201621162216231624162516261627162816291630163116321633163416351636163716381639164016411642164316441645164616471648164916501651165216531654165516561657165816591660166116621663166416651666166716681669167016711672167316741675167616771678167916801681168216831684168516861687168816891690169116921693169416951696169716981699170017011702170317041705170617071708170917101711171217131714171517161717171817191720172117221723172417251726172717281729173017311732173317341735173617371738173917401741174217431744174517461747174817491750175117521753175417551756175717581759176017611762176317641765176617671768176917701771177217731774177517761777177817791780178117821783178417851786178717881789179017911792179317941795179617971798179918001801180218031804180518061807180818091810181118121813181418151816181718181819182018211822182318241825182618271828182918301831183218331834183518361837183818391840184118421843184418451846184718481849185018511852185318541855185618571858185918601861186218631864186518661867186818691870187118721873187418751876187718781879188018811882188318841885188618871888188918901891189218931894189518961897189818991900190119021903190419051906190719081909191019111912191319141915191619171918191919201921192219231924192519261927192819291930193119321933193419351936193719381939194019411942194319441945194619471948194919501951195219531954195519561957195819591960196119621963196419651966196719681969197019711972197319741975197619771978197919801981198219831984198519861987198819891990199119921993199419951996199719981999200020012002200320042005200620072008200920102011201220132014201520162017201820192020202120222023202420252026
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Tue, 5 Apr 2016 20:30:56 +0200
  3. Subject: xtables-addons: build: fix configure compatiblity with POSIX shells
  4. diff --git a/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch b/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch
  5. new file mode 100644
  6. index 0000000..e0b11b5
  7. --- /dev/null
  8. +++ b/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch
  9. @@ -0,0 +1,51 @@
  10. +From f07a0a5cb8b3c5e1aee8b30c7fa21ccfbf24a95a Mon Sep 17 00:00:00 2001
  11. +Message-Id: <f07a0a5cb8b3c5e1aee8b30c7fa21ccfbf24a95a.1459880505.git.mschiffer@universe-factory.net>
  12. +From: Matthias Schiffer <mschiffer@universe-factory.net>
  13. +Date: Fri, 1 Apr 2016 22:24:00 +0200
  14. +Subject: [PATCH] build: fix configure compatiblity with POSIX shells
  15. +
  16. +The kernel version detection code uses some bashisms, which makes the build
  17. +fail on Debian systems where /bin/sh links to dash. Replace with POSIX-
  18. +conforming commands at the cost of requiring awk.
  19. +---
  20. + configure.ac | 24 +++++++++---------------
  21. + 1 file changed, 9 insertions(+), 15 deletions(-)
  22. +
  23. +diff --git a/configure.ac b/configure.ac
  24. +index 82a1355..5a5ea57 100644
  25. +--- a/configure.ac
  26. ++++ b/configure.ac
  27. +@@ -44,21 +44,15 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
  28. +
  29. + if test -n "$kbuilddir"; then
  30. + AC_MSG_CHECKING([kernel version that we will build against])
  31. +- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
  32. +- kmajor="${krel%%[[^0-9]]*}";
  33. +- kmajor="$(($kmajor+0))";
  34. +- krel="${krel:${#kmajor}}";
  35. +- krel="${krel#.}";
  36. +- kminor="${krel%%[[^0-9]]*}";
  37. +- kminor="$(($kminor+0))";
  38. +- krel="${krel:${#kminor}}";
  39. +- krel="${krel#.}";
  40. +- kmicro="${krel%%[[^0-9]]*}";
  41. +- kmicro="$(($kmicro+0))";
  42. +- krel="${krel:${#kmicro}}";
  43. +- krel="${krel#.}";
  44. +- kstable="${krel%%[[^0-9]]*}";
  45. +- kstable="$(($kstable+0))";
  46. ++ krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
  47. ++ save_IFS=$IFS;
  48. ++ IFS='.';
  49. ++ set x $krel;
  50. ++ IFS=$save_IFS;
  51. ++ kmajor="$(($2+0))";
  52. ++ kminor="$(($3+0))";
  53. ++ kmicro="$(($4+0))";
  54. ++ kstable="$(($5+0))";
  55. + if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then
  56. + echo "WARNING: Version detection did not succeed. Continue at own luck.";
  57. + else
  58. +--
  59. +2.8.0
  60. +
  61. diff --git a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
  62. index d3b7caa..6a7a099 100644
  63. --- a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
  64. +++ b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
  65. @@ -1,1954 +1,11 @@
  66. ---- a/configure
  67. -+++ b/configure
  68. -@@ -1,9 +1,11 @@
  69. - #! /bin/sh
  70. - # Guess values for system-dependent variables and create Makefiles.
  71. --# Generated by GNU Autoconf 2.69 for xtables-addons 2.5.
  72. -+# Generated by GNU Autoconf 2.68 for xtables-addons 2.5.
  73. - #
  74. - #
  75. --# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
  76. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  77. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
  78. -+# Foundation, Inc.
  79. - #
  80. - #
  81. - # This configure script is free software; the Free Software Foundation
  82. -@@ -132,31 +134,6 @@ export LANGUAGE
  83. - # CDPATH.
  84. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  85. -
  86. --# Use a proper internal environment variable to ensure we don't fall
  87. -- # into an infinite loop, continuously re-executing ourselves.
  88. -- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
  89. -- _as_can_reexec=no; export _as_can_reexec;
  90. -- # We cannot yet assume a decent shell, so we have to provide a
  91. --# neutralization value for shells without unset; and this also
  92. --# works around shells that cannot unset nonexistent variables.
  93. --# Preserve -v and -x to the replacement shell.
  94. --BASH_ENV=/dev/null
  95. --ENV=/dev/null
  96. --(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
  97. --case $- in # ((((
  98. -- *v*x* | *x*v* ) as_opts=-vx ;;
  99. -- *v* ) as_opts=-v ;;
  100. -- *x* ) as_opts=-x ;;
  101. -- * ) as_opts= ;;
  102. --esac
  103. --exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
  104. --# Admittedly, this is quite paranoid, since all the known shells bail
  105. --# out after a failed `exec'.
  106. --$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
  107. --as_fn_exit 255
  108. -- fi
  109. -- # We don't want this to propagate to other subprocesses.
  110. -- { _as_can_reexec=; unset _as_can_reexec;}
  111. - if test "x$CONFIG_SHELL" = x; then
  112. - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
  113. - emulate sh
  114. -@@ -190,8 +167,7 @@ if ( set x; as_fn_ret_success y && test
  115. - else
  116. - exitcode=1; echo positional parameters were not saved.
  117. - fi
  118. --test x\$exitcode = x0 || exit 1
  119. --test -x / || exit 1"
  120. -+test x\$exitcode = x0 || exit 1"
  121. - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
  122. - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
  123. - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
  124. -@@ -244,25 +220,21 @@ IFS=$as_save_IFS
  125. -
  126. -
  127. - if test "x$CONFIG_SHELL" != x; then :
  128. -- export CONFIG_SHELL
  129. -- # We cannot yet assume a decent shell, so we have to provide a
  130. --# neutralization value for shells without unset; and this also
  131. --# works around shells that cannot unset nonexistent variables.
  132. --# Preserve -v and -x to the replacement shell.
  133. --BASH_ENV=/dev/null
  134. --ENV=/dev/null
  135. --(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
  136. --case $- in # ((((
  137. -- *v*x* | *x*v* ) as_opts=-vx ;;
  138. -- *v* ) as_opts=-v ;;
  139. -- *x* ) as_opts=-x ;;
  140. -- * ) as_opts= ;;
  141. --esac
  142. --exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
  143. --# Admittedly, this is quite paranoid, since all the known shells bail
  144. --# out after a failed `exec'.
  145. --$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
  146. --exit 255
  147. -+ # We cannot yet assume a decent shell, so we have to provide a
  148. -+ # neutralization value for shells without unset; and this also
  149. -+ # works around shells that cannot unset nonexistent variables.
  150. -+ # Preserve -v and -x to the replacement shell.
  151. -+ BASH_ENV=/dev/null
  152. -+ ENV=/dev/null
  153. -+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
  154. -+ export CONFIG_SHELL
  155. -+ case $- in # ((((
  156. -+ *v*x* | *x*v* ) as_opts=-vx ;;
  157. -+ *v* ) as_opts=-v ;;
  158. -+ *x* ) as_opts=-x ;;
  159. -+ * ) as_opts= ;;
  160. -+ esac
  161. -+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
  162. - fi
  163. -
  164. - if test x$as_have_required = xno; then :
  165. -@@ -364,14 +336,6 @@ $as_echo X"$as_dir" |
  166. -
  167. -
  168. - } # as_fn_mkdir_p
  169. --
  170. --# as_fn_executable_p FILE
  171. --# -----------------------
  172. --# Test if FILE is an executable regular file.
  173. --as_fn_executable_p ()
  174. --{
  175. -- test -f "$1" && test -x "$1"
  176. --} # as_fn_executable_p
  177. - # as_fn_append VAR VALUE
  178. - # ----------------------
  179. - # Append the text in VALUE to the end of the definition contained in VAR. Take
  180. -@@ -493,10 +457,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
  181. - chmod +x "$as_me.lineno" ||
  182. - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
  183. -
  184. -- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
  185. -- # already done that, so ensure we don't try to do so again and fall
  186. -- # in an infinite loop. This has already happened in practice.
  187. -- _as_can_reexec=no; export _as_can_reexec
  188. - # Don't try to exec as it changes $[0], causing all sort of problems
  189. - # (the dirname of $[0] is not the place where we might find the
  190. - # original and so on. Autoconf is especially sensitive to this).
  191. -@@ -531,16 +491,16 @@ if (echo >conf$$.file) 2>/dev/null; then
  192. - # ... but there are two gotchas:
  193. - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
  194. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
  195. -- # In both cases, we have to default to `cp -pR'.
  196. -+ # In both cases, we have to default to `cp -p'.
  197. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
  198. -- as_ln_s='cp -pR'
  199. -+ as_ln_s='cp -p'
  200. - elif ln conf$$.file conf$$ 2>/dev/null; then
  201. - as_ln_s=ln
  202. - else
  203. -- as_ln_s='cp -pR'
  204. -+ as_ln_s='cp -p'
  205. - fi
  206. - else
  207. -- as_ln_s='cp -pR'
  208. -+ as_ln_s='cp -p'
  209. - fi
  210. - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  211. - rmdir conf$$.dir 2>/dev/null
  212. -@@ -552,8 +512,28 @@ else
  213. - as_mkdir_p=false
  214. - fi
  215. -
  216. --as_test_x='test -x'
  217. --as_executable_p=as_fn_executable_p
  218. -+if test -x / >/dev/null 2>&1; then
  219. -+ as_test_x='test -x'
  220. -+else
  221. -+ if ls -dL / >/dev/null 2>&1; then
  222. -+ as_ls_L_option=L
  223. -+ else
  224. -+ as_ls_L_option=
  225. -+ fi
  226. -+ as_test_x='
  227. -+ eval sh -c '\''
  228. -+ if test -d "$1"; then
  229. -+ test -d "$1/.";
  230. -+ else
  231. -+ case $1 in #(
  232. -+ -*)set "./$1";;
  233. -+ esac;
  234. -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
  235. -+ ???[sx]*):;;*)false;;esac;fi
  236. -+ '\'' sh
  237. -+ '
  238. -+fi
  239. -+as_executable_p=$as_test_x
  240. -
  241. - # Sed expression to map a string onto a valid CPP name.
  242. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  243. -@@ -688,10 +668,6 @@ CPPFLAGS
  244. - LDFLAGS
  245. - CFLAGS
  246. - CC
  247. --AM_BACKSLASH
  248. --AM_DEFAULT_VERBOSITY
  249. --AM_DEFAULT_V
  250. --AM_V
  251. - am__untar
  252. - am__tar
  253. - AMTAR
  254. -@@ -756,7 +732,6 @@ SHELL'
  255. - ac_subst_files=''
  256. - ac_user_opts='
  257. - enable_option_checking
  258. --enable_silent_rules
  259. - enable_dependency_tracking
  260. - enable_static
  261. - enable_shared
  262. -@@ -1237,6 +1212,8 @@ target=$target_alias
  263. - if test "x$host_alias" != x; then
  264. - if test "x$build_alias" = x; then
  265. - cross_compiling=maybe
  266. -+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
  267. -+ If a cross compiler is detected then cross compile mode will be used" >&2
  268. - elif test "x$build_alias" != "x$host_alias"; then
  269. - cross_compiling=yes
  270. - fi
  271. -@@ -1400,12 +1377,8 @@ Optional Features:
  272. - --disable-option-checking ignore unrecognized --enable/--with options
  273. - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
  274. - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
  275. -- --enable-silent-rules less verbose build output (undo: "make V=1")
  276. -- --disable-silent-rules verbose build output (undo: "make V=0")
  277. -- --enable-dependency-tracking
  278. -- do not reject slow dependency extractors
  279. -- --disable-dependency-tracking
  280. -- speeds up one-time build
  281. -+ --disable-dependency-tracking speeds up one-time build
  282. -+ --enable-dependency-tracking do not reject slow dependency extractors
  283. - --enable-static[=PKGS] build static libraries [default=no]
  284. - --enable-shared[=PKGS] build shared libraries [default=yes]
  285. - --enable-fast-install[=PKGS]
  286. -@@ -1415,7 +1388,7 @@ Optional Features:
  287. - Optional Packages:
  288. - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
  289. - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
  290. -- --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
  291. -+ --with-pic try to use only PIC/non-PIC objects [default=use
  292. - both]
  293. - --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  294. - --with-sysroot=DIR Search for dependent libraries within DIR
  295. -@@ -1512,9 +1485,9 @@ test -n "$ac_init_help" && exit $ac_stat
  296. - if $ac_init_version; then
  297. - cat <<\_ACEOF
  298. - xtables-addons configure 2.5
  299. --generated by GNU Autoconf 2.69
  300. -+generated by GNU Autoconf 2.68
  301. -
  302. --Copyright (C) 2012 Free Software Foundation, Inc.
  303. -+Copyright (C) 2010 Free Software Foundation, Inc.
  304. - This configure script is free software; the Free Software Foundation
  305. - gives unlimited permission to copy, distribute and modify it.
  306. - _ACEOF
  307. -@@ -1590,7 +1563,7 @@ $as_echo "$ac_try_echo"; } >&5
  308. - test ! -s conftest.err
  309. - } && test -s conftest$ac_exeext && {
  310. - test "$cross_compiling" = yes ||
  311. -- test -x conftest$ac_exeext
  312. -+ $as_test_x conftest$ac_exeext
  313. - }; then :
  314. - ac_retval=0
  315. - else
  316. -@@ -1877,7 +1850,7 @@ This file contains any messages produced
  317. - running configure, to aid debugging if configure makes a mistake.
  318. -
  319. - It was created by xtables-addons $as_me 2.5, which was
  320. --generated by GNU Autoconf 2.69. Invocation command line was
  321. -+generated by GNU Autoconf 2.68. Invocation command line was
  322. -
  323. - $ $0 $@
  324. -
  325. -@@ -2293,7 +2266,7 @@ case $as_dir/ in #((
  326. - # by default.
  327. - for ac_prog in ginstall scoinst install; do
  328. - for ac_exec_ext in '' $ac_executable_extensions; do
  329. -- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
  330. -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  331. - if test $ac_prog = install &&
  332. - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  333. - # AIX install. It has an incompatible calling convention.
  334. -@@ -2349,10 +2322,13 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  335. -
  336. - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  337. -
  338. --am__api_version='1.14'
  339. -+am__api_version='1.11'
  340. -
  341. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
  342. - $as_echo_n "checking whether build environment is sane... " >&6; }
  343. -+# Just in case
  344. -+sleep 1
  345. -+echo timestamp > conftest.file
  346. - # Reject unsafe characters in $srcdir or the absolute working directory
  347. - # name. Accept space and tab only in the latter.
  348. - am_lf='
  349. -@@ -2363,40 +2339,32 @@ case `pwd` in
  350. - esac
  351. - case $srcdir in
  352. - *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
  353. -- as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
  354. -+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
  355. - esac
  356. -
  357. --# Do 'set' in a subshell so we don't clobber the current shell's
  358. -+# Do `set' in a subshell so we don't clobber the current shell's
  359. - # arguments. Must try -L first in case configure is actually a
  360. - # symlink; some systems play weird games with the mod time of symlinks
  361. - # (eg FreeBSD returns the mod time of the symlink's containing
  362. - # directory).
  363. - if (
  364. -- am_has_slept=no
  365. -- for am_try in 1 2; do
  366. -- echo "timestamp, slept: $am_has_slept" > conftest.file
  367. -- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
  368. -- if test "$*" = "X"; then
  369. -- # -L didn't work.
  370. -- set X `ls -t "$srcdir/configure" conftest.file`
  371. -- fi
  372. -- if test "$*" != "X $srcdir/configure conftest.file" \
  373. -- && test "$*" != "X conftest.file $srcdir/configure"; then
  374. -+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
  375. -+ if test "$*" = "X"; then
  376. -+ # -L didn't work.
  377. -+ set X `ls -t "$srcdir/configure" conftest.file`
  378. -+ fi
  379. -+ rm -f conftest.file
  380. -+ if test "$*" != "X $srcdir/configure conftest.file" \
  381. -+ && test "$*" != "X conftest.file $srcdir/configure"; then
  382. -+
  383. -+ # If neither matched, then we have a broken ls. This can happen
  384. -+ # if, for instance, CONFIG_SHELL is bash and it inherits a
  385. -+ # broken ls alias from the environment. This has actually
  386. -+ # happened. Such a system could not be considered "sane".
  387. -+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
  388. -+alias in your environment" "$LINENO" 5
  389. -+ fi
  390. -
  391. -- # If neither matched, then we have a broken ls. This can happen
  392. -- # if, for instance, CONFIG_SHELL is bash and it inherits a
  393. -- # broken ls alias from the environment. This has actually
  394. -- # happened. Such a system could not be considered "sane".
  395. -- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
  396. -- alias in your environment" "$LINENO" 5
  397. -- fi
  398. -- if test "$2" = conftest.file || test $am_try -eq 2; then
  399. -- break
  400. -- fi
  401. -- # Just in case.
  402. -- sleep 1
  403. -- am_has_slept=yes
  404. -- done
  405. - test "$2" = conftest.file
  406. - )
  407. - then
  408. -@@ -2408,16 +2376,6 @@ Check your system clock" "$LINENO" 5
  409. - fi
  410. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  411. - $as_echo "yes" >&6; }
  412. --# If we didn't sleep, we still need to ensure time stamps of config.status and
  413. --# generated files are strictly newer.
  414. --am_sleep_pid=
  415. --if grep 'slept: no' conftest.file >/dev/null 2>&1; then
  416. -- ( sleep 1 ) &
  417. -- am_sleep_pid=$!
  418. --fi
  419. --
  420. --rm -f conftest.file
  421. --
  422. - test "$program_prefix" != NONE &&
  423. - program_transform_name="s&^&$program_prefix&;$program_transform_name"
  424. - # Use a double $ so make ignores it.
  425. -@@ -2440,12 +2398,12 @@ if test x"${MISSING+set}" != xset; then
  426. - esac
  427. - fi
  428. - # Use eval to expand $SHELL
  429. --if eval "$MISSING --is-lightweight"; then
  430. -- am_missing_run="$MISSING "
  431. -+if eval "$MISSING --run true"; then
  432. -+ am_missing_run="$MISSING --run "
  433. - else
  434. - am_missing_run=
  435. -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
  436. --$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
  437. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
  438. -+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  439. - fi
  440. -
  441. - if test x"${install_sh}" != xset; then
  442. -@@ -2457,10 +2415,10 @@ if test x"${install_sh}" != xset; then
  443. - esac
  444. - fi
  445. -
  446. --# Installed binaries are usually stripped using 'strip' when the user
  447. --# run "make install-strip". However 'strip' might not be the right
  448. -+# Installed binaries are usually stripped using `strip' when the user
  449. -+# run `make install-strip'. However `strip' might not be the right
  450. - # tool to use in cross-compilation environments, therefore Automake
  451. --# will honor the 'STRIP' environment variable to overrule this program.
  452. -+# will honor the `STRIP' environment variable to overrule this program.
  453. - if test "$cross_compiling" != no; then
  454. - if test -n "$ac_tool_prefix"; then
  455. - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  456. -@@ -2479,7 +2437,7 @@ do
  457. - IFS=$as_save_IFS
  458. - test -z "$as_dir" && as_dir=.
  459. - for ac_exec_ext in '' $ac_executable_extensions; do
  460. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  461. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  462. - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  463. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  464. - break 2
  465. -@@ -2519,7 +2477,7 @@ do
  466. - IFS=$as_save_IFS
  467. - test -z "$as_dir" && as_dir=.
  468. - for ac_exec_ext in '' $ac_executable_extensions; do
  469. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  470. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  471. - ac_cv_prog_ac_ct_STRIP="strip"
  472. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  473. - break 2
  474. -@@ -2570,7 +2528,7 @@ do
  475. - test -z "$as_dir" && as_dir=.
  476. - for ac_prog in mkdir gmkdir; do
  477. - for ac_exec_ext in '' $ac_executable_extensions; do
  478. -- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
  479. -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  480. - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
  481. - 'mkdir (GNU coreutils) '* | \
  482. - 'mkdir (coreutils) '* | \
  483. -@@ -2599,6 +2557,12 @@ fi
  484. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
  485. - $as_echo "$MKDIR_P" >&6; }
  486. -
  487. -+mkdir_p="$MKDIR_P"
  488. -+case $mkdir_p in
  489. -+ [\\/$]* | ?:[\\/]*) ;;
  490. -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
  491. -+esac
  492. -+
  493. - for ac_prog in gawk mawk nawk awk
  494. - do
  495. - # Extract the first word of "$ac_prog", so it can be a program name with args.
  496. -@@ -2617,7 +2581,7 @@ do
  497. - IFS=$as_save_IFS
  498. - test -z "$as_dir" && as_dir=.
  499. - for ac_exec_ext in '' $ac_executable_extensions; do
  500. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  501. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  502. - ac_cv_prog_AWK="$ac_prog"
  503. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  504. - break 2
  505. -@@ -2681,45 +2645,6 @@ else
  506. - fi
  507. - rmdir .tst 2>/dev/null
  508. -
  509. --# Check whether --enable-silent-rules was given.
  510. --if test "${enable_silent_rules+set}" = set; then :
  511. -- enableval=$enable_silent_rules;
  512. --fi
  513. --
  514. --case $enable_silent_rules in # (((
  515. -- yes) AM_DEFAULT_VERBOSITY=0;;
  516. -- no) AM_DEFAULT_VERBOSITY=1;;
  517. -- *) AM_DEFAULT_VERBOSITY=1;;
  518. --esac
  519. --am_make=${MAKE-make}
  520. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
  521. --$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
  522. --if ${am_cv_make_support_nested_variables+:} false; then :
  523. -- $as_echo_n "(cached) " >&6
  524. --else
  525. -- if $as_echo 'TRUE=$(BAR$(V))
  526. --BAR0=false
  527. --BAR1=true
  528. --V=1
  529. --am__doit:
  530. -- @$(TRUE)
  531. --.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
  532. -- am_cv_make_support_nested_variables=yes
  533. --else
  534. -- am_cv_make_support_nested_variables=no
  535. --fi
  536. --fi
  537. --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
  538. --$as_echo "$am_cv_make_support_nested_variables" >&6; }
  539. --if test $am_cv_make_support_nested_variables = yes; then
  540. -- AM_V='$(V)'
  541. -- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
  542. --else
  543. -- AM_V=$AM_DEFAULT_VERBOSITY
  544. -- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
  545. --fi
  546. --AM_BACKSLASH='\'
  547. --
  548. - if test "`cd $srcdir && pwd`" != "`pwd`"; then
  549. - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
  550. - # is not polluted with repeated "-I."
  551. -@@ -2770,111 +2695,18 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
  552. -
  553. - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  554. -
  555. --# For better backward compatibility. To be removed once Automake 1.9.x
  556. --# dies out for good. For more background, see:
  557. --# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  558. --# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  559. --mkdir_p='$(MKDIR_P)'
  560. --
  561. - # We need awk for the "check" target. The system "awk" is bad on
  562. - # some platforms.
  563. - # Always define AMTAR for backward compatibility. Yes, it's still used
  564. - # in the wild :-( We should find a proper way to deprecate it ...
  565. - AMTAR='$${TAR-tar}'
  566. -
  567. --
  568. --# We'll loop over all known methods to create a tar archive until one works.
  569. --_am_tools='gnutar pax cpio none'
  570. --
  571. - am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
  572. -
  573. -
  574. -
  575. -
  576. -
  577. --
  578. --# POSIX will say in a future version that running "rm -f" with no argument
  579. --# is OK; and we want to be able to make that assumption in our Makefile
  580. --# recipes. So use an aggressive probe to check that the usage we want is
  581. --# actually supported "in the wild" to an acceptable degree.
  582. --# See automake bug#10828.
  583. --# To make any issue more visible, cause the running configure to be aborted
  584. --# by default if the 'rm' program in use doesn't match our expectations; the
  585. --# user can still override this though.
  586. --if rm -f && rm -fr && rm -rf; then : OK; else
  587. -- cat >&2 <<'END'
  588. --Oops!
  589. --
  590. --Your 'rm' program seems unable to run without file operands specified
  591. --on the command line, even when the '-f' option is present. This is contrary
  592. --to the behaviour of most rm programs out there, and not conforming with
  593. --the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
  594. --
  595. --Please tell bug-automake@gnu.org about your system, including the value
  596. --of your $PATH and any error possibly output before this message. This
  597. --can help us improve future automake versions.
  598. --
  599. --END
  600. -- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
  601. -- echo 'Configuration will proceed anyway, since you have set the' >&2
  602. -- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
  603. -- echo >&2
  604. -- else
  605. -- cat >&2 <<'END'
  606. --Aborting the configuration process, to ensure you take notice of the issue.
  607. --
  608. --You can download and install GNU coreutils to get an 'rm' implementation
  609. --that behaves properly: <http://www.gnu.org/software/coreutils/>.
  610. --
  611. --If you want to complete the configuration process using your problematic
  612. --'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
  613. --to "yes", and re-run configure.
  614. --
  615. --END
  616. -- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
  617. -- fi
  618. --fi
  619. --
  620. --# Check whether --enable-silent-rules was given.
  621. --if test "${enable_silent_rules+set}" = set; then :
  622. -- enableval=$enable_silent_rules;
  623. --fi
  624. --
  625. --case $enable_silent_rules in # (((
  626. -- yes) AM_DEFAULT_VERBOSITY=0;;
  627. -- no) AM_DEFAULT_VERBOSITY=1;;
  628. -- *) AM_DEFAULT_VERBOSITY=0;;
  629. --esac
  630. --am_make=${MAKE-make}
  631. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
  632. --$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
  633. --if ${am_cv_make_support_nested_variables+:} false; then :
  634. -- $as_echo_n "(cached) " >&6
  635. --else
  636. -- if $as_echo 'TRUE=$(BAR$(V))
  637. --BAR0=false
  638. --BAR1=true
  639. --V=1
  640. --am__doit:
  641. -- @$(TRUE)
  642. --.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
  643. -- am_cv_make_support_nested_variables=yes
  644. --else
  645. -- am_cv_make_support_nested_variables=no
  646. --fi
  647. --fi
  648. --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
  649. --$as_echo "$am_cv_make_support_nested_variables" >&6; }
  650. --if test $am_cv_make_support_nested_variables = yes; then
  651. -- AM_V='$(V)'
  652. -- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
  653. --else
  654. -- AM_V=$AM_DEFAULT_VERBOSITY
  655. -- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
  656. --fi
  657. --AM_BACKSLASH='\'
  658. --
  659. --
  660. - ac_ext=c
  661. - ac_cpp='$CPP $CPPFLAGS'
  662. - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  663. -@@ -2897,7 +2729,7 @@ do
  664. - IFS=$as_save_IFS
  665. - test -z "$as_dir" && as_dir=.
  666. - for ac_exec_ext in '' $ac_executable_extensions; do
  667. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  668. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  669. - ac_cv_prog_CC="${ac_tool_prefix}gcc"
  670. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  671. - break 2
  672. -@@ -2937,7 +2769,7 @@ do
  673. - IFS=$as_save_IFS
  674. - test -z "$as_dir" && as_dir=.
  675. - for ac_exec_ext in '' $ac_executable_extensions; do
  676. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  677. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  678. - ac_cv_prog_ac_ct_CC="gcc"
  679. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  680. - break 2
  681. -@@ -2990,7 +2822,7 @@ do
  682. - IFS=$as_save_IFS
  683. - test -z "$as_dir" && as_dir=.
  684. - for ac_exec_ext in '' $ac_executable_extensions; do
  685. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  686. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  687. - ac_cv_prog_CC="${ac_tool_prefix}cc"
  688. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  689. - break 2
  690. -@@ -3031,7 +2863,7 @@ do
  691. - IFS=$as_save_IFS
  692. - test -z "$as_dir" && as_dir=.
  693. - for ac_exec_ext in '' $ac_executable_extensions; do
  694. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  695. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  696. - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
  697. - ac_prog_rejected=yes
  698. - continue
  699. -@@ -3089,7 +2921,7 @@ do
  700. - IFS=$as_save_IFS
  701. - test -z "$as_dir" && as_dir=.
  702. - for ac_exec_ext in '' $ac_executable_extensions; do
  703. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  704. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  705. - ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
  706. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  707. - break 2
  708. -@@ -3133,7 +2965,7 @@ do
  709. - IFS=$as_save_IFS
  710. - test -z "$as_dir" && as_dir=.
  711. - for ac_exec_ext in '' $ac_executable_extensions; do
  712. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  713. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  714. - ac_cv_prog_ac_ct_CC="$ac_prog"
  715. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  716. - break 2
  717. -@@ -3579,7 +3411,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  718. - /* end confdefs.h. */
  719. - #include <stdarg.h>
  720. - #include <stdio.h>
  721. --struct stat;
  722. -+#include <sys/types.h>
  723. -+#include <sys/stat.h>
  724. - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
  725. - struct buf { int x; };
  726. - FILE * (*rcsopen) (struct buf *, struct stat *, int);
  727. -@@ -3663,65 +3496,6 @@ ac_cpp='$CPP $CPPFLAGS'
  728. - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  729. - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  730. - ac_compiler_gnu=$ac_cv_c_compiler_gnu
  731. --
  732. --ac_ext=c
  733. --ac_cpp='$CPP $CPPFLAGS'
  734. --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  735. --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  736. --ac_compiler_gnu=$ac_cv_c_compiler_gnu
  737. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
  738. --$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
  739. --if ${am_cv_prog_cc_c_o+:} false; then :
  740. -- $as_echo_n "(cached) " >&6
  741. --else
  742. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  743. --/* end confdefs.h. */
  744. --
  745. --int
  746. --main ()
  747. --{
  748. --
  749. -- ;
  750. -- return 0;
  751. --}
  752. --_ACEOF
  753. -- # Make sure it works both with $CC and with simple cc.
  754. -- # Following AC_PROG_CC_C_O, we do the test twice because some
  755. -- # compilers refuse to overwrite an existing .o file with -o,
  756. -- # though they will create one.
  757. -- am_cv_prog_cc_c_o=yes
  758. -- for am_i in 1 2; do
  759. -- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
  760. -- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
  761. -- ac_status=$?
  762. -- echo "$as_me:$LINENO: \$? = $ac_status" >&5
  763. -- (exit $ac_status); } \
  764. -- && test -f conftest2.$ac_objext; then
  765. -- : OK
  766. -- else
  767. -- am_cv_prog_cc_c_o=no
  768. -- break
  769. -- fi
  770. -- done
  771. -- rm -f core conftest*
  772. -- unset am_i
  773. --fi
  774. --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
  775. --$as_echo "$am_cv_prog_cc_c_o" >&6; }
  776. --if test "$am_cv_prog_cc_c_o" != yes; then
  777. -- # Losing compiler, so override with the script.
  778. -- # FIXME: It is wrong to rewrite CC.
  779. -- # But if we don't then we get into trouble of one sort or another.
  780. -- # A longer-term fix would be to have automake use am__CC in this case,
  781. -- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
  782. -- CC="$am_aux_dir/compile $CC"
  783. --fi
  784. --ac_ext=c
  785. --ac_cpp='$CPP $CPPFLAGS'
  786. --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  787. --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  788. --ac_compiler_gnu=$ac_cv_c_compiler_gnu
  789. --
  790. - DEPDIR="${am__leading_dot}deps"
  791. -
  792. - ac_config_commands="$ac_config_commands depfiles"
  793. -@@ -3741,7 +3515,7 @@ am__quote=
  794. - _am_result=none
  795. - # First try GNU make style include.
  796. - echo "include confinc" > confmf
  797. --# Ignore all kinds of additional output from 'make'.
  798. -+# Ignore all kinds of additional output from `make'.
  799. - case `$am_make -s -f confmf 2> /dev/null` in #(
  800. - *the\ am__doit\ target*)
  801. - am__include=include
  802. -@@ -3797,8 +3571,8 @@ else
  803. - # We make a subdir and do the tests there. Otherwise we can end up
  804. - # making bogus files that we don't know about and never remove. For
  805. - # instance it was reported that on HP-UX the gcc test will end up
  806. -- # making a dummy file named 'D' -- because '-MD' means "put the output
  807. -- # in D".
  808. -+ # making a dummy file named `D' -- because `-MD' means `put the output
  809. -+ # in D'.
  810. - rm -rf conftest.dir
  811. - mkdir conftest.dir
  812. - # Copy depcomp to subdir because otherwise we won't find it if we're
  813. -@@ -3833,16 +3607,16 @@ else
  814. - : > sub/conftest.c
  815. - for i in 1 2 3 4 5 6; do
  816. - echo '#include "conftst'$i'.h"' >> sub/conftest.c
  817. -- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
  818. -- # Solaris 10 /bin/sh.
  819. -- echo '/* dummy */' > sub/conftst$i.h
  820. -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
  821. -+ # Solaris 8's {/usr,}/bin/sh.
  822. -+ touch sub/conftst$i.h
  823. - done
  824. - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  825. -
  826. -- # We check with '-c' and '-o' for the sake of the "dashmstdout"
  827. -+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
  828. - # mode. It turns out that the SunPro C++ compiler does not properly
  829. -- # handle '-M -o', and we need to detect this. Also, some Intel
  830. -- # versions had trouble with output in subdirs.
  831. -+ # handle `-M -o', and we need to detect this. Also, some Intel
  832. -+ # versions had trouble with output in subdirs
  833. - am__obj=sub/conftest.${OBJEXT-o}
  834. - am__minus_obj="-o $am__obj"
  835. - case $depmode in
  836. -@@ -3851,8 +3625,8 @@ else
  837. - test "$am__universal" = false || continue
  838. - ;;
  839. - nosideeffect)
  840. -- # After this tag, mechanisms are not by side-effect, so they'll
  841. -- # only be used when explicitly requested.
  842. -+ # after this tag, mechanisms are not by side-effect, so they'll
  843. -+ # only be used when explicitly requested
  844. - if test "x$enable_dependency_tracking" = xyes; then
  845. - continue
  846. - else
  847. -@@ -3860,7 +3634,7 @@ else
  848. - fi
  849. - ;;
  850. - msvc7 | msvc7msys | msvisualcpp | msvcmsys)
  851. -- # This compiler won't grok '-c -o', but also, the minuso test has
  852. -+ # This compiler won't grok `-c -o', but also, the minuso test has
  853. - # not run yet. These depmodes are late enough in the game, and
  854. - # so weak that their functioning should not be impacted.
  855. - am__obj=conftest.${OBJEXT-o}
  856. -@@ -3914,6 +3688,131 @@ else
  857. - fi
  858. -
  859. -
  860. -+if test "x$CC" != xcc; then
  861. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
  862. -+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
  863. -+else
  864. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
  865. -+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
  866. -+fi
  867. -+set dummy $CC; ac_cc=`$as_echo "$2" |
  868. -+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
  869. -+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
  870. -+ $as_echo_n "(cached) " >&6
  871. -+else
  872. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  873. -+/* end confdefs.h. */
  874. -+
  875. -+int
  876. -+main ()
  877. -+{
  878. -+
  879. -+ ;
  880. -+ return 0;
  881. -+}
  882. -+_ACEOF
  883. -+# Make sure it works both with $CC and with simple cc.
  884. -+# We do the test twice because some compilers refuse to overwrite an
  885. -+# existing .o file with -o, though they will create one.
  886. -+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
  887. -+rm -f conftest2.*
  888. -+if { { case "(($ac_try" in
  889. -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  890. -+ *) ac_try_echo=$ac_try;;
  891. -+esac
  892. -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  893. -+$as_echo "$ac_try_echo"; } >&5
  894. -+ (eval "$ac_try") 2>&5
  895. -+ ac_status=$?
  896. -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  897. -+ test $ac_status = 0; } &&
  898. -+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
  899. -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  900. -+ *) ac_try_echo=$ac_try;;
  901. -+esac
  902. -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  903. -+$as_echo "$ac_try_echo"; } >&5
  904. -+ (eval "$ac_try") 2>&5
  905. -+ ac_status=$?
  906. -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  907. -+ test $ac_status = 0; };
  908. -+then
  909. -+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
  910. -+ if test "x$CC" != xcc; then
  911. -+ # Test first that cc exists at all.
  912. -+ if { ac_try='cc -c conftest.$ac_ext >&5'
  913. -+ { { case "(($ac_try" in
  914. -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  915. -+ *) ac_try_echo=$ac_try;;
  916. -+esac
  917. -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  918. -+$as_echo "$ac_try_echo"; } >&5
  919. -+ (eval "$ac_try") 2>&5
  920. -+ ac_status=$?
  921. -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  922. -+ test $ac_status = 0; }; }; then
  923. -+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
  924. -+ rm -f conftest2.*
  925. -+ if { { case "(($ac_try" in
  926. -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  927. -+ *) ac_try_echo=$ac_try;;
  928. -+esac
  929. -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  930. -+$as_echo "$ac_try_echo"; } >&5
  931. -+ (eval "$ac_try") 2>&5
  932. -+ ac_status=$?
  933. -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  934. -+ test $ac_status = 0; } &&
  935. -+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
  936. -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  937. -+ *) ac_try_echo=$ac_try;;
  938. -+esac
  939. -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  940. -+$as_echo "$ac_try_echo"; } >&5
  941. -+ (eval "$ac_try") 2>&5
  942. -+ ac_status=$?
  943. -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  944. -+ test $ac_status = 0; };
  945. -+ then
  946. -+ # cc works too.
  947. -+ :
  948. -+ else
  949. -+ # cc exists but doesn't like -o.
  950. -+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
  951. -+ fi
  952. -+ fi
  953. -+ fi
  954. -+else
  955. -+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
  956. -+fi
  957. -+rm -f core conftest*
  958. -+
  959. -+fi
  960. -+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
  961. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  962. -+$as_echo "yes" >&6; }
  963. -+else
  964. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  965. -+$as_echo "no" >&6; }
  966. -+
  967. -+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
  968. -+
  969. -+fi
  970. -+
  971. -+# FIXME: we rely on the cache variable name because
  972. -+# there is no other way.
  973. -+set dummy $CC
  974. -+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
  975. -+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
  976. -+if test "$am_t" != yes; then
  977. -+ # Losing compiler, so override with the script.
  978. -+ # FIXME: It is wrong to rewrite CC.
  979. -+ # But if we don't then we get into trouble of one sort or another.
  980. -+ # A longer-term fix would be to have automake use am__CC in this case,
  981. -+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
  982. -+ CC="$am_aux_dir/compile $CC"
  983. -+fi
  984. -+
  985. -
  986. -
  987. - if test -n "$ac_tool_prefix"; then
  988. -@@ -3935,7 +3834,7 @@ do
  989. - IFS=$as_save_IFS
  990. - test -z "$as_dir" && as_dir=.
  991. - for ac_exec_ext in '' $ac_executable_extensions; do
  992. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  993. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  994. - ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  995. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  996. - break 2
  997. -@@ -3979,7 +3878,7 @@ do
  998. - IFS=$as_save_IFS
  999. - test -z "$as_dir" && as_dir=.
  1000. - for ac_exec_ext in '' $ac_executable_extensions; do
  1001. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1002. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1003. - ac_cv_prog_ac_ct_AR="$ac_prog"
  1004. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1005. - break 2
  1006. -@@ -4023,13 +3922,7 @@ $as_echo_n "checking the archiver ($AR)
  1007. - if ${am_cv_ar_interface+:} false; then :
  1008. - $as_echo_n "(cached) " >&6
  1009. - else
  1010. -- ac_ext=c
  1011. --ac_cpp='$CPP $CPPFLAGS'
  1012. --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1013. --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1014. --ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1015. --
  1016. -- am_cv_ar_interface=ar
  1017. -+ am_cv_ar_interface=ar
  1018. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1019. - /* end confdefs.h. */
  1020. - int some_variable = 0;
  1021. -@@ -4060,11 +3953,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
  1022. -
  1023. - fi
  1024. - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  1025. -- ac_ext=c
  1026. --ac_cpp='$CPP $CPPFLAGS'
  1027. --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  1028. --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  1029. --ac_compiler_gnu=$ac_cv_c_compiler_gnu
  1030. -
  1031. - fi
  1032. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
  1033. -@@ -4126,8 +4014,8 @@ esac
  1034. -
  1035. -
  1036. -
  1037. --macro_version='2.4.2'
  1038. --macro_revision='1.3337'
  1039. -+macro_version='2.4'
  1040. -+macro_revision='1.3293'
  1041. -
  1042. -
  1043. -
  1044. -@@ -4305,7 +4193,7 @@ do
  1045. - for ac_prog in sed gsed; do
  1046. - for ac_exec_ext in '' $ac_executable_extensions; do
  1047. - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
  1048. -- as_fn_executable_p "$ac_path_SED" || continue
  1049. -+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
  1050. - # Check for GNU ac_path_SED and select it if it is found.
  1051. - # Check for GNU $ac_path_SED
  1052. - case `"$ac_path_SED" --version 2>&1` in
  1053. -@@ -4381,7 +4269,7 @@ do
  1054. - for ac_prog in grep ggrep; do
  1055. - for ac_exec_ext in '' $ac_executable_extensions; do
  1056. - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
  1057. -- as_fn_executable_p "$ac_path_GREP" || continue
  1058. -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
  1059. - # Check for GNU ac_path_GREP and select it if it is found.
  1060. - # Check for GNU $ac_path_GREP
  1061. - case `"$ac_path_GREP" --version 2>&1` in
  1062. -@@ -4447,7 +4335,7 @@ do
  1063. - for ac_prog in egrep; do
  1064. - for ac_exec_ext in '' $ac_executable_extensions; do
  1065. - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  1066. -- as_fn_executable_p "$ac_path_EGREP" || continue
  1067. -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  1068. - # Check for GNU ac_path_EGREP and select it if it is found.
  1069. - # Check for GNU $ac_path_EGREP
  1070. - case `"$ac_path_EGREP" --version 2>&1` in
  1071. -@@ -4514,7 +4402,7 @@ do
  1072. - for ac_prog in fgrep; do
  1073. - for ac_exec_ext in '' $ac_executable_extensions; do
  1074. - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
  1075. -- as_fn_executable_p "$ac_path_FGREP" || continue
  1076. -+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
  1077. - # Check for GNU ac_path_FGREP and select it if it is found.
  1078. - # Check for GNU $ac_path_FGREP
  1079. - case `"$ac_path_FGREP" --version 2>&1` in
  1080. -@@ -4770,7 +4658,7 @@ do
  1081. - IFS=$as_save_IFS
  1082. - test -z "$as_dir" && as_dir=.
  1083. - for ac_exec_ext in '' $ac_executable_extensions; do
  1084. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1085. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1086. - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
  1087. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1088. - break 2
  1089. -@@ -4814,7 +4702,7 @@ do
  1090. - IFS=$as_save_IFS
  1091. - test -z "$as_dir" && as_dir=.
  1092. - for ac_exec_ext in '' $ac_executable_extensions; do
  1093. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1094. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1095. - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
  1096. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1097. - break 2
  1098. -@@ -4972,11 +4860,6 @@ else
  1099. - lt_cv_sys_max_cmd_len=196608
  1100. - ;;
  1101. -
  1102. -- os2*)
  1103. -- # The test takes a long time on OS/2.
  1104. -- lt_cv_sys_max_cmd_len=8192
  1105. -- ;;
  1106. --
  1107. - osf*)
  1108. - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
  1109. - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
  1110. -@@ -5016,7 +4899,7 @@ else
  1111. - # If test is not a shell built-in, we'll probably end up computing a
  1112. - # maximum length that is only half of the actual maximum length, but
  1113. - # we can't tell.
  1114. -- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
  1115. -+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
  1116. - = "X$teststring$teststring"; } >/dev/null 2>&1 &&
  1117. - test $i != 17 # 1/2 MB should be enough
  1118. - do
  1119. -@@ -5238,7 +5121,7 @@ do
  1120. - IFS=$as_save_IFS
  1121. - test -z "$as_dir" && as_dir=.
  1122. - for ac_exec_ext in '' $ac_executable_extensions; do
  1123. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1124. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1125. - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  1126. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1127. - break 2
  1128. -@@ -5278,7 +5161,7 @@ do
  1129. - IFS=$as_save_IFS
  1130. - test -z "$as_dir" && as_dir=.
  1131. - for ac_exec_ext in '' $ac_executable_extensions; do
  1132. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1133. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1134. - ac_cv_prog_ac_ct_OBJDUMP="objdump"
  1135. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1136. - break 2
  1137. -@@ -5445,7 +5328,7 @@ irix5* | irix6* | nonstopux*)
  1138. - lt_cv_deplibs_check_method=pass_all
  1139. - ;;
  1140. -
  1141. --# This must be glibc/ELF.
  1142. -+# This must be Linux ELF.
  1143. - linux* | k*bsd*-gnu | kopensolaris*-gnu)
  1144. - lt_cv_deplibs_check_method=pass_all
  1145. - ;;
  1146. -@@ -5584,7 +5467,7 @@ do
  1147. - IFS=$as_save_IFS
  1148. - test -z "$as_dir" && as_dir=.
  1149. - for ac_exec_ext in '' $ac_executable_extensions; do
  1150. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1151. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1152. - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  1153. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1154. - break 2
  1155. -@@ -5624,7 +5507,7 @@ do
  1156. - IFS=$as_save_IFS
  1157. - test -z "$as_dir" && as_dir=.
  1158. - for ac_exec_ext in '' $ac_executable_extensions; do
  1159. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1160. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1161. - ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  1162. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1163. - break 2
  1164. -@@ -5727,7 +5610,7 @@ do
  1165. - IFS=$as_save_IFS
  1166. - test -z "$as_dir" && as_dir=.
  1167. - for ac_exec_ext in '' $ac_executable_extensions; do
  1168. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1169. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1170. - ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  1171. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1172. - break 2
  1173. -@@ -5771,7 +5654,7 @@ do
  1174. - IFS=$as_save_IFS
  1175. - test -z "$as_dir" && as_dir=.
  1176. - for ac_exec_ext in '' $ac_executable_extensions; do
  1177. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1178. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1179. - ac_cv_prog_ac_ct_AR="$ac_prog"
  1180. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1181. - break 2
  1182. -@@ -5896,7 +5779,7 @@ do
  1183. - IFS=$as_save_IFS
  1184. - test -z "$as_dir" && as_dir=.
  1185. - for ac_exec_ext in '' $ac_executable_extensions; do
  1186. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1187. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1188. - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  1189. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1190. - break 2
  1191. -@@ -5936,7 +5819,7 @@ do
  1192. - IFS=$as_save_IFS
  1193. - test -z "$as_dir" && as_dir=.
  1194. - for ac_exec_ext in '' $ac_executable_extensions; do
  1195. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1196. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1197. - ac_cv_prog_ac_ct_STRIP="strip"
  1198. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1199. - break 2
  1200. -@@ -5995,7 +5878,7 @@ do
  1201. - IFS=$as_save_IFS
  1202. - test -z "$as_dir" && as_dir=.
  1203. - for ac_exec_ext in '' $ac_executable_extensions; do
  1204. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1205. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1206. - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
  1207. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1208. - break 2
  1209. -@@ -6035,7 +5918,7 @@ do
  1210. - IFS=$as_save_IFS
  1211. - test -z "$as_dir" && as_dir=.
  1212. - for ac_exec_ext in '' $ac_executable_extensions; do
  1213. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1214. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1215. - ac_cv_prog_ac_ct_RANLIB="ranlib"
  1216. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1217. - break 2
  1218. -@@ -6085,13 +5968,13 @@ old_postuninstall_cmds=
  1219. - if test -n "$RANLIB"; then
  1220. - case $host_os in
  1221. - openbsd*)
  1222. -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
  1223. -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
  1224. - ;;
  1225. - *)
  1226. -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
  1227. -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
  1228. - ;;
  1229. - esac
  1230. -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
  1231. -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  1232. - fi
  1233. -
  1234. - case $host_os in
  1235. -@@ -6238,7 +6121,6 @@ for ac_symprfx in "" "_"; do
  1236. - # which start with @ or ?.
  1237. - lt_cv_sys_global_symbol_pipe="$AWK '"\
  1238. - " {last_section=section; section=\$ 3};"\
  1239. --" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
  1240. - " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
  1241. - " \$ 0!~/External *\|/{next};"\
  1242. - " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
  1243. -@@ -6627,7 +6509,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
  1244. - CFLAGS="$SAVE_CFLAGS"
  1245. - fi
  1246. - ;;
  1247. --*-*solaris*)
  1248. -+sparc*-*solaris*)
  1249. - # Find out which ABI we are using.
  1250. - echo 'int i;' > conftest.$ac_ext
  1251. - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  1252. -@@ -6638,20 +6520,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
  1253. - case `/usr/bin/file conftest.o` in
  1254. - *64-bit*)
  1255. - case $lt_cv_prog_gnu_ld in
  1256. -- yes*)
  1257. -- case $host in
  1258. -- i?86-*-solaris*)
  1259. -- LD="${LD-ld} -m elf_x86_64"
  1260. -- ;;
  1261. -- sparc*-*-solaris*)
  1262. -- LD="${LD-ld} -m elf64_sparc"
  1263. -- ;;
  1264. -- esac
  1265. -- # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
  1266. -- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
  1267. -- LD="${LD-ld}_sol2"
  1268. -- fi
  1269. -- ;;
  1270. -+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
  1271. - *)
  1272. - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
  1273. - LD="${LD-ld} -64"
  1274. -@@ -6684,7 +6553,7 @@ do
  1275. - IFS=$as_save_IFS
  1276. - test -z "$as_dir" && as_dir=.
  1277. - for ac_exec_ext in '' $ac_executable_extensions; do
  1278. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1279. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1280. - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  1281. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1282. - break 2
  1283. -@@ -6724,7 +6593,7 @@ do
  1284. - IFS=$as_save_IFS
  1285. - test -z "$as_dir" && as_dir=.
  1286. - for ac_exec_ext in '' $ac_executable_extensions; do
  1287. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1288. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1289. - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  1290. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1291. - break 2
  1292. -@@ -6804,7 +6673,7 @@ do
  1293. - IFS=$as_save_IFS
  1294. - test -z "$as_dir" && as_dir=.
  1295. - for ac_exec_ext in '' $ac_executable_extensions; do
  1296. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1297. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1298. - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
  1299. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1300. - break 2
  1301. -@@ -6844,7 +6713,7 @@ do
  1302. - IFS=$as_save_IFS
  1303. - test -z "$as_dir" && as_dir=.
  1304. - for ac_exec_ext in '' $ac_executable_extensions; do
  1305. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1306. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1307. - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
  1308. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1309. - break 2
  1310. -@@ -6896,7 +6765,7 @@ do
  1311. - IFS=$as_save_IFS
  1312. - test -z "$as_dir" && as_dir=.
  1313. - for ac_exec_ext in '' $ac_executable_extensions; do
  1314. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1315. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1316. - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
  1317. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1318. - break 2
  1319. -@@ -6936,7 +6805,7 @@ do
  1320. - IFS=$as_save_IFS
  1321. - test -z "$as_dir" && as_dir=.
  1322. - for ac_exec_ext in '' $ac_executable_extensions; do
  1323. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1324. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1325. - ac_cv_prog_ac_ct_NMEDIT="nmedit"
  1326. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1327. - break 2
  1328. -@@ -6988,7 +6857,7 @@ do
  1329. - IFS=$as_save_IFS
  1330. - test -z "$as_dir" && as_dir=.
  1331. - for ac_exec_ext in '' $ac_executable_extensions; do
  1332. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1333. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1334. - ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
  1335. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1336. - break 2
  1337. -@@ -7028,7 +6897,7 @@ do
  1338. - IFS=$as_save_IFS
  1339. - test -z "$as_dir" && as_dir=.
  1340. - for ac_exec_ext in '' $ac_executable_extensions; do
  1341. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1342. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1343. - ac_cv_prog_ac_ct_LIPO="lipo"
  1344. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1345. - break 2
  1346. -@@ -7080,7 +6949,7 @@ do
  1347. - IFS=$as_save_IFS
  1348. - test -z "$as_dir" && as_dir=.
  1349. - for ac_exec_ext in '' $ac_executable_extensions; do
  1350. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1351. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1352. - ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
  1353. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1354. - break 2
  1355. -@@ -7120,7 +6989,7 @@ do
  1356. - IFS=$as_save_IFS
  1357. - test -z "$as_dir" && as_dir=.
  1358. - for ac_exec_ext in '' $ac_executable_extensions; do
  1359. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1360. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1361. - ac_cv_prog_ac_ct_OTOOL="otool"
  1362. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1363. - break 2
  1364. -@@ -7172,7 +7041,7 @@ do
  1365. - IFS=$as_save_IFS
  1366. - test -z "$as_dir" && as_dir=.
  1367. - for ac_exec_ext in '' $ac_executable_extensions; do
  1368. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1369. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1370. - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
  1371. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1372. - break 2
  1373. -@@ -7212,7 +7081,7 @@ do
  1374. - IFS=$as_save_IFS
  1375. - test -z "$as_dir" && as_dir=.
  1376. - for ac_exec_ext in '' $ac_executable_extensions; do
  1377. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1378. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1379. - ac_cv_prog_ac_ct_OTOOL64="otool64"
  1380. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1381. - break 2
  1382. -@@ -7291,13 +7160,7 @@ else
  1383. - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
  1384. - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
  1385. - _lt_result=$?
  1386. -- # If there is a non-empty error log, and "single_module"
  1387. -- # appears in it, assume the flag caused a linker warning
  1388. -- if test -s conftest.err && $GREP single_module conftest.err; then
  1389. -- cat conftest.err >&5
  1390. -- # Otherwise, if the output was created with a 0 exit code from
  1391. -- # the compiler, it worked.
  1392. -- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
  1393. -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
  1394. - lt_cv_apple_cc_single_mod=yes
  1395. - else
  1396. - cat conftest.err >&5
  1397. -@@ -7308,7 +7171,6 @@ else
  1398. - fi
  1399. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
  1400. - $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
  1401. --
  1402. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
  1403. - $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
  1404. - if ${lt_cv_ld_exported_symbols_list+:} false; then :
  1405. -@@ -7341,7 +7203,6 @@ rm -f core conftest.err conftest.$ac_obj
  1406. - fi
  1407. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
  1408. - $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
  1409. --
  1410. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
  1411. - $as_echo_n "checking for -force_load linker flag... " >&6; }
  1412. - if ${lt_cv_ld_force_load+:} false; then :
  1413. -@@ -7363,9 +7224,7 @@ _LT_EOF
  1414. - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
  1415. - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
  1416. - _lt_result=$?
  1417. -- if test -s conftest.err && $GREP force_load conftest.err; then
  1418. -- cat conftest.err >&5
  1419. -- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
  1420. -+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
  1421. - lt_cv_ld_force_load=yes
  1422. - else
  1423. - cat conftest.err >&5
  1424. -@@ -7740,22 +7599,7 @@ fi
  1425. -
  1426. - # Check whether --with-pic was given.
  1427. - if test "${with_pic+set}" = set; then :
  1428. -- withval=$with_pic; lt_p=${PACKAGE-default}
  1429. -- case $withval in
  1430. -- yes|no) pic_mode=$withval ;;
  1431. -- *)
  1432. -- pic_mode=default
  1433. -- # Look at the argument we got. We use all the common list separators.
  1434. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  1435. -- for lt_pkg in $withval; do
  1436. -- IFS="$lt_save_ifs"
  1437. -- if test "X$lt_pkg" = "X$lt_p"; then
  1438. -- pic_mode=yes
  1439. -- fi
  1440. -- done
  1441. -- IFS="$lt_save_ifs"
  1442. -- ;;
  1443. -- esac
  1444. -+ withval=$with_pic; pic_mode="$withval"
  1445. - else
  1446. - pic_mode=default
  1447. - fi
  1448. -@@ -7833,10 +7677,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  1449. -
  1450. -
  1451. -
  1452. --
  1453. --
  1454. --
  1455. --
  1456. - test -z "$LN_S" && LN_S="ln -s"
  1457. -
  1458. -
  1459. -@@ -8126,10 +7966,6 @@ _lt_linker_boilerplate=`cat conftest.err
  1460. - $RM -r conftest*
  1461. -
  1462. -
  1463. --## CAVEAT EMPTOR:
  1464. --## There is no encapsulation within the following macros, do not change
  1465. --## the running order or otherwise move them around unless you know exactly
  1466. --## what you are doing...
  1467. - if test -n "$compiler"; then
  1468. -
  1469. - lt_prog_compiler_no_builtin_flag=
  1470. -@@ -8296,9 +8132,7 @@ lt_prog_compiler_static=
  1471. - case $cc_basename in
  1472. - nvcc*) # Cuda Compiler Driver 2.2
  1473. - lt_prog_compiler_wl='-Xlinker '
  1474. -- if test -n "$lt_prog_compiler_pic"; then
  1475. -- lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
  1476. -- fi
  1477. -+ lt_prog_compiler_pic='-Xcompiler -fPIC'
  1478. - ;;
  1479. - esac
  1480. - else
  1481. -@@ -8389,33 +8223,18 @@ lt_prog_compiler_static=
  1482. - ;;
  1483. - *)
  1484. - case `$CC -V 2>&1 | sed 5q` in
  1485. -- *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
  1486. -+ *Sun\ F* | *Sun*Fortran*)
  1487. - # Sun Fortran 8.3 passes all unrecognized flags to the linker
  1488. - lt_prog_compiler_pic='-KPIC'
  1489. - lt_prog_compiler_static='-Bstatic'
  1490. - lt_prog_compiler_wl=''
  1491. - ;;
  1492. -- *Sun\ F* | *Sun*Fortran*)
  1493. -- lt_prog_compiler_pic='-KPIC'
  1494. -- lt_prog_compiler_static='-Bstatic'
  1495. -- lt_prog_compiler_wl='-Qoption ld '
  1496. -- ;;
  1497. - *Sun\ C*)
  1498. - # Sun C 5.9
  1499. - lt_prog_compiler_pic='-KPIC'
  1500. - lt_prog_compiler_static='-Bstatic'
  1501. - lt_prog_compiler_wl='-Wl,'
  1502. - ;;
  1503. -- *Intel*\ [CF]*Compiler*)
  1504. -- lt_prog_compiler_wl='-Wl,'
  1505. -- lt_prog_compiler_pic='-fPIC'
  1506. -- lt_prog_compiler_static='-static'
  1507. -- ;;
  1508. -- *Portland\ Group*)
  1509. -- lt_prog_compiler_wl='-Wl,'
  1510. -- lt_prog_compiler_pic='-fpic'
  1511. -- lt_prog_compiler_static='-Bstatic'
  1512. -- ;;
  1513. - esac
  1514. - ;;
  1515. - esac
  1516. -@@ -8777,6 +8596,7 @@ $as_echo_n "checking whether the $compil
  1517. - hardcode_direct=no
  1518. - hardcode_direct_absolute=no
  1519. - hardcode_libdir_flag_spec=
  1520. -+ hardcode_libdir_flag_spec_ld=
  1521. - hardcode_libdir_separator=
  1522. - hardcode_minus_L=no
  1523. - hardcode_shlibpath_var=unsupported
  1524. -@@ -9026,7 +8846,8 @@ _LT_EOF
  1525. - xlf* | bgf* | bgxlf* | mpixlf*)
  1526. - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
  1527. - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  1528. -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  1529. -+ hardcode_libdir_flag_spec=
  1530. -+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
  1531. - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  1532. - if test "x$supports_anon_versioning" = xyes; then
  1533. - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  1534. -@@ -9405,7 +9226,6 @@ fi
  1535. - # The linker will not automatically build a static lib if we build a DLL.
  1536. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  1537. - enable_shared_with_static_runtimes=yes
  1538. -- exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
  1539. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  1540. - # Don't use ranlib
  1541. - old_postinstall_cmds='chmod 644 $oldlib'
  1542. -@@ -9451,7 +9271,6 @@ fi
  1543. - hardcode_shlibpath_var=unsupported
  1544. - if test "$lt_cv_ld_force_load" = "yes"; then
  1545. - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
  1546. --
  1547. - else
  1548. - whole_archive_flag_spec=''
  1549. - fi
  1550. -@@ -9480,6 +9299,10 @@ fi
  1551. - hardcode_shlibpath_var=no
  1552. - ;;
  1553. -
  1554. -+ freebsd1*)
  1555. -+ ld_shlibs=no
  1556. -+ ;;
  1557. -+
  1558. - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
  1559. - # support. Future versions do this automatically, but an explicit c++rt0.o
  1560. - # does not break anything, and helps significantly (at the cost of a little
  1561. -@@ -9492,7 +9315,7 @@ fi
  1562. - ;;
  1563. -
  1564. - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
  1565. -- freebsd2.*)
  1566. -+ freebsd2*)
  1567. - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
  1568. - hardcode_direct=yes
  1569. - hardcode_minus_L=yes
  1570. -@@ -9531,6 +9354,7 @@ fi
  1571. - fi
  1572. - if test "$with_gnu_ld" = no; then
  1573. - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
  1574. -+ hardcode_libdir_flag_spec_ld='+b $libdir'
  1575. - hardcode_libdir_separator=:
  1576. - hardcode_direct=yes
  1577. - hardcode_direct_absolute=yes
  1578. -@@ -10154,6 +9978,11 @@ esac
  1579. -
  1580. -
  1581. -
  1582. -+
  1583. -+
  1584. -+
  1585. -+
  1586. -+
  1587. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
  1588. - $as_echo_n "checking dynamic linker characteristics... " >&6; }
  1589. -
  1590. -@@ -10243,7 +10072,7 @@ need_version=unknown
  1591. -
  1592. - case $host_os in
  1593. - aix3*)
  1594. -- version_type=linux # correct to gnu/linux during the next big refactor
  1595. -+ version_type=linux
  1596. - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
  1597. - shlibpath_var=LIBPATH
  1598. -
  1599. -@@ -10252,7 +10081,7 @@ aix3*)
  1600. - ;;
  1601. -
  1602. - aix[4-9]*)
  1603. -- version_type=linux # correct to gnu/linux during the next big refactor
  1604. -+ version_type=linux
  1605. - need_lib_prefix=no
  1606. - need_version=no
  1607. - hardcode_into_libs=yes
  1608. -@@ -10317,7 +10146,7 @@ beos*)
  1609. - ;;
  1610. -
  1611. - bsdi[45]*)
  1612. -- version_type=linux # correct to gnu/linux during the next big refactor
  1613. -+ version_type=linux
  1614. - need_version=no
  1615. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  1616. - soname_spec='${libname}${release}${shared_ext}$major'
  1617. -@@ -10456,7 +10285,7 @@ darwin* | rhapsody*)
  1618. - ;;
  1619. -
  1620. - dgux*)
  1621. -- version_type=linux # correct to gnu/linux during the next big refactor
  1622. -+ version_type=linux
  1623. - need_lib_prefix=no
  1624. - need_version=no
  1625. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
  1626. -@@ -10464,6 +10293,10 @@ dgux*)
  1627. - shlibpath_var=LD_LIBRARY_PATH
  1628. - ;;
  1629. -
  1630. -+freebsd1*)
  1631. -+ dynamic_linker=no
  1632. -+ ;;
  1633. -+
  1634. - freebsd* | dragonfly*)
  1635. - # DragonFly does not have aout. When/if they implement a new
  1636. - # versioning mechanism, adjust this.
  1637. -@@ -10471,7 +10304,7 @@ freebsd* | dragonfly*)
  1638. - objformat=`/usr/bin/objformat`
  1639. - else
  1640. - case $host_os in
  1641. -- freebsd[23].*) objformat=aout ;;
  1642. -+ freebsd[123]*) objformat=aout ;;
  1643. - *) objformat=elf ;;
  1644. - esac
  1645. - fi
  1646. -@@ -10489,7 +10322,7 @@ freebsd* | dragonfly*)
  1647. - esac
  1648. - shlibpath_var=LD_LIBRARY_PATH
  1649. - case $host_os in
  1650. -- freebsd2.*)
  1651. -+ freebsd2*)
  1652. - shlibpath_overrides_runpath=yes
  1653. - ;;
  1654. - freebsd3.[01]* | freebsdelf3.[01]*)
  1655. -@@ -10509,18 +10342,17 @@ freebsd* | dragonfly*)
  1656. - ;;
  1657. -
  1658. - gnu*)
  1659. -- version_type=linux # correct to gnu/linux during the next big refactor
  1660. -+ version_type=linux
  1661. - need_lib_prefix=no
  1662. - need_version=no
  1663. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
  1664. - soname_spec='${libname}${release}${shared_ext}$major'
  1665. - shlibpath_var=LD_LIBRARY_PATH
  1666. -- shlibpath_overrides_runpath=no
  1667. - hardcode_into_libs=yes
  1668. - ;;
  1669. -
  1670. - haiku*)
  1671. -- version_type=linux # correct to gnu/linux during the next big refactor
  1672. -+ version_type=linux
  1673. - need_lib_prefix=no
  1674. - need_version=no
  1675. - dynamic_linker="$host_os runtime_loader"
  1676. -@@ -10581,7 +10413,7 @@ hpux9* | hpux10* | hpux11*)
  1677. - ;;
  1678. -
  1679. - interix[3-9]*)
  1680. -- version_type=linux # correct to gnu/linux during the next big refactor
  1681. -+ version_type=linux
  1682. - need_lib_prefix=no
  1683. - need_version=no
  1684. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
  1685. -@@ -10597,7 +10429,7 @@ irix5* | irix6* | nonstopux*)
  1686. - nonstopux*) version_type=nonstopux ;;
  1687. - *)
  1688. - if test "$lt_cv_prog_gnu_ld" = yes; then
  1689. -- version_type=linux # correct to gnu/linux during the next big refactor
  1690. -+ version_type=linux
  1691. - else
  1692. - version_type=irix
  1693. - fi ;;
  1694. -@@ -10634,9 +10466,9 @@ linux*oldld* | linux*aout* | linux*coff*
  1695. - dynamic_linker=no
  1696. - ;;
  1697. -
  1698. --# This must be glibc/ELF.
  1699. -+# This must be Linux ELF.
  1700. - linux* | k*bsd*-gnu | kopensolaris*-gnu)
  1701. -- version_type=linux # correct to gnu/linux during the next big refactor
  1702. -+ version_type=linux
  1703. - need_lib_prefix=no
  1704. - need_version=no
  1705. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  1706. -@@ -10718,7 +10550,7 @@ netbsd*)
  1707. - ;;
  1708. -
  1709. - newsos6)
  1710. -- version_type=linux # correct to gnu/linux during the next big refactor
  1711. -+ version_type=linux
  1712. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  1713. - shlibpath_var=LD_LIBRARY_PATH
  1714. - shlibpath_overrides_runpath=yes
  1715. -@@ -10787,7 +10619,7 @@ rdos*)
  1716. - ;;
  1717. -
  1718. - solaris*)
  1719. -- version_type=linux # correct to gnu/linux during the next big refactor
  1720. -+ version_type=linux
  1721. - need_lib_prefix=no
  1722. - need_version=no
  1723. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  1724. -@@ -10812,7 +10644,7 @@ sunos4*)
  1725. - ;;
  1726. -
  1727. - sysv4 | sysv4.3*)
  1728. -- version_type=linux # correct to gnu/linux during the next big refactor
  1729. -+ version_type=linux
  1730. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  1731. - soname_spec='${libname}${release}${shared_ext}$major'
  1732. - shlibpath_var=LD_LIBRARY_PATH
  1733. -@@ -10836,7 +10668,7 @@ sysv4 | sysv4.3*)
  1734. -
  1735. - sysv4*MP*)
  1736. - if test -d /usr/nec ;then
  1737. -- version_type=linux # correct to gnu/linux during the next big refactor
  1738. -+ version_type=linux
  1739. - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
  1740. - soname_spec='$libname${shared_ext}.$major'
  1741. - shlibpath_var=LD_LIBRARY_PATH
  1742. -@@ -10867,7 +10699,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
  1743. -
  1744. - tpf*)
  1745. - # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
  1746. -- version_type=linux # correct to gnu/linux during the next big refactor
  1747. -+ version_type=linux
  1748. - need_lib_prefix=no
  1749. - need_version=no
  1750. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  1751. -@@ -10877,7 +10709,7 @@ tpf*)
  1752. - ;;
  1753. -
  1754. - uts4*)
  1755. -- version_type=linux # correct to gnu/linux during the next big refactor
  1756. -+ version_type=linux
  1757. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  1758. - soname_spec='${libname}${release}${shared_ext}$major'
  1759. - shlibpath_var=LD_LIBRARY_PATH
  1760. -@@ -11659,8 +11491,6 @@ CC="$lt_save_CC"
  1761. -
  1762. -
  1763. -
  1764. --
  1765. --
  1766. - ac_config_commands="$ac_config_commands libtool"
  1767. -
  1768. -
  1769. -@@ -11726,7 +11556,7 @@ do
  1770. - IFS=$as_save_IFS
  1771. - test -z "$as_dir" && as_dir=.
  1772. - for ac_exec_ext in '' $ac_executable_extensions; do
  1773. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1774. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1775. - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  1776. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1777. - break 2
  1778. -@@ -11769,7 +11599,7 @@ do
  1779. - IFS=$as_save_IFS
  1780. - test -z "$as_dir" && as_dir=.
  1781. - for ac_exec_ext in '' $ac_executable_extensions; do
  1782. -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  1783. -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  1784. - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  1785. - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  1786. - break 2
  1787. -@@ -11932,7 +11762,7 @@ regular_CFLAGS="-Wall -Waggregate-return
  1788. - if test -n "$kbuilddir"; then
  1789. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5
  1790. - $as_echo_n "checking kernel version that we will build against... " >&6; }
  1791. -- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
  1792. -+ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
  1793. - kmajor="${krel%%[^0-9]*}";
  1794. - kmajor="$(($kmajor+0))";
  1795. - krel="${krel:${#kmajor}}";
  1796. -@@ -12076,14 +11906,6 @@ LIBOBJS=$ac_libobjs
  1797. - LTLIBOBJS=$ac_ltlibobjs
  1798. -
  1799. -
  1800. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
  1801. --$as_echo_n "checking that generated files are newer than configure... " >&6; }
  1802. -- if test -n "$am_sleep_pid"; then
  1803. -- # Hide warnings about reused PIDs.
  1804. -- wait $am_sleep_pid 2>/dev/null
  1805. -- fi
  1806. -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
  1807. --$as_echo "done" >&6; }
  1808. - if test -n "$EXEEXT"; then
  1809. - am__EXEEXT_TRUE=
  1810. - am__EXEEXT_FALSE='#'
  1811. -@@ -12398,16 +12220,16 @@ if (echo >conf$$.file) 2>/dev/null; then
  1812. - # ... but there are two gotchas:
  1813. - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
  1814. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
  1815. -- # In both cases, we have to default to `cp -pR'.
  1816. -+ # In both cases, we have to default to `cp -p'.
  1817. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
  1818. -- as_ln_s='cp -pR'
  1819. -+ as_ln_s='cp -p'
  1820. - elif ln conf$$.file conf$$ 2>/dev/null; then
  1821. - as_ln_s=ln
  1822. - else
  1823. -- as_ln_s='cp -pR'
  1824. -+ as_ln_s='cp -p'
  1825. - fi
  1826. - else
  1827. -- as_ln_s='cp -pR'
  1828. -+ as_ln_s='cp -p'
  1829. - fi
  1830. - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  1831. - rmdir conf$$.dir 2>/dev/null
  1832. -@@ -12467,16 +12289,28 @@ else
  1833. - as_mkdir_p=false
  1834. - fi
  1835. -
  1836. --
  1837. --# as_fn_executable_p FILE
  1838. --# -----------------------
  1839. --# Test if FILE is an executable regular file.
  1840. --as_fn_executable_p ()
  1841. --{
  1842. -- test -f "$1" && test -x "$1"
  1843. --} # as_fn_executable_p
  1844. --as_test_x='test -x'
  1845. --as_executable_p=as_fn_executable_p
  1846. -+if test -x / >/dev/null 2>&1; then
  1847. -+ as_test_x='test -x'
  1848. -+else
  1849. -+ if ls -dL / >/dev/null 2>&1; then
  1850. -+ as_ls_L_option=L
  1851. -+ else
  1852. -+ as_ls_L_option=
  1853. -+ fi
  1854. -+ as_test_x='
  1855. -+ eval sh -c '\''
  1856. -+ if test -d "$1"; then
  1857. -+ test -d "$1/.";
  1858. -+ else
  1859. -+ case $1 in #(
  1860. -+ -*)set "./$1";;
  1861. -+ esac;
  1862. -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
  1863. -+ ???[sx]*):;;*)false;;esac;fi
  1864. -+ '\'' sh
  1865. -+ '
  1866. -+fi
  1867. -+as_executable_p=$as_test_x
  1868. -
  1869. - # Sed expression to map a string onto a valid CPP name.
  1870. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  1871. -@@ -12498,7 +12332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
  1872. - # values after options handling.
  1873. - ac_log="
  1874. - This file was extended by xtables-addons $as_me 2.5, which was
  1875. --generated by GNU Autoconf 2.69. Invocation command line was
  1876. -+generated by GNU Autoconf 2.68. Invocation command line was
  1877. -
  1878. - CONFIG_FILES = $CONFIG_FILES
  1879. - CONFIG_HEADERS = $CONFIG_HEADERS
  1880. -@@ -12564,10 +12398,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
  1881. - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  1882. - ac_cs_version="\\
  1883. - xtables-addons config.status 2.5
  1884. --configured by $0, generated by GNU Autoconf 2.69,
  1885. -+configured by $0, generated by GNU Autoconf 2.68,
  1886. - with options \\"\$ac_cs_config\\"
  1887. -
  1888. --Copyright (C) 2012 Free Software Foundation, Inc.
  1889. -+Copyright (C) 2010 Free Software Foundation, Inc.
  1890. - This config.status script is free software; the Free Software Foundation
  1891. - gives unlimited permission to copy, distribute and modify it."
  1892. -
  1893. -@@ -12658,7 +12492,7 @@ fi
  1894. - _ACEOF
  1895. - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1896. - if \$ac_cs_recheck; then
  1897. -- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  1898. -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  1899. - shift
  1900. - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
  1901. - CONFIG_SHELL='$SHELL'
  1902. -@@ -12700,7 +12534,6 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$de
  1903. - enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
  1904. - SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
  1905. - ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
  1906. --PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
  1907. - host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
  1908. - host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
  1909. - host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
  1910. -@@ -12783,6 +12616,7 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SE
  1911. - allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
  1912. - no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
  1913. - hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
  1914. -+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
  1915. - hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
  1916. - hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
  1917. - hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
  1918. -@@ -12838,7 +12672,6 @@ _LTECHO_EOF'
  1919. - # Quote evaled strings.
  1920. - for var in SHELL \
  1921. - ECHO \
  1922. --PATH_SEPARATOR \
  1923. - SED \
  1924. - GREP \
  1925. - EGREP \
  1926. -@@ -12889,6 +12722,7 @@ with_gnu_ld \
  1927. - allow_undefined_flag \
  1928. - no_undefined_flag \
  1929. - hardcode_libdir_flag_spec \
  1930. -+hardcode_libdir_flag_spec_ld \
  1931. - hardcode_libdir_separator \
  1932. - exclude_expsyms \
  1933. - include_expsyms \
  1934. -@@ -13575,7 +13409,7 @@ $as_echo "$as_me: executing $ac_file com
  1935. -
  1936. - case $ac_file$ac_mode in
  1937. - "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
  1938. -- # Older Autoconf quotes --file arguments for eval, but not when files
  1939. -+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
  1940. - # are listed without --file. Let's play safe and only enable the eval
  1941. - # if we detect the quoting.
  1942. - case $CONFIG_FILES in
  1943. -@@ -13588,7 +13422,7 @@ $as_echo "$as_me: executing $ac_file com
  1944. - # Strip MF so we end up with the name of the file.
  1945. - mf=`echo "$mf" | sed -e 's/:.*$//'`
  1946. - # Check whether this is an Automake generated Makefile or not.
  1947. -- # We used to match only the files named 'Makefile.in', but
  1948. -+ # We used to match only the files named `Makefile.in', but
  1949. - # some people rename them; so instead we look at the file content.
  1950. - # Grep'ing the first line is not enough: some people post-process
  1951. - # each Makefile.in and add a new line on top of each file to say so.
  1952. -@@ -13622,19 +13456,21 @@ $as_echo X"$mf" |
  1953. - continue
  1954. - fi
  1955. - # Extract the definition of DEPDIR, am__include, and am__quote
  1956. -- # from the Makefile without running 'make'.
  1957. -+ # from the Makefile without running `make'.
  1958. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  1959. - test -z "$DEPDIR" && continue
  1960. - am__include=`sed -n 's/^am__include = //p' < "$mf"`
  1961. -- test -z "$am__include" && continue
  1962. -+ test -z "am__include" && continue
  1963. - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  1964. -+ # When using ansi2knr, U may be empty or an underscore; expand it
  1965. -+ U=`sed -n 's/^U = //p' < "$mf"`
  1966. - # Find all dependency output files, they are included files with
  1967. - # $(DEPDIR) in their names. We invoke sed twice because it is the
  1968. - # simplest approach to changing $(DEPDIR) to its actual value in the
  1969. - # expansion.
  1970. - for file in `sed -n "
  1971. - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  1972. -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
  1973. -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
  1974. - # Make sure the directory exists.
  1975. - test -f "$dirpart/$file" && continue
  1976. - fdir=`$as_dirname -- "$file" ||
  1977. -@@ -13688,8 +13524,8 @@ $as_echo X"$file" |
  1978. - # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  1979. - #
  1980. - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  1981. --# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
  1982. --# Foundation, Inc.
  1983. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  1984. -+# Inc.
  1985. - # Written by Gordon Matzigkeit, 1996
  1986. - #
  1987. - # This file is part of GNU Libtool.
  1988. -@@ -13743,9 +13579,6 @@ SHELL=$lt_SHELL
  1989. - # An echo program that protects backslashes.
  1990. - ECHO=$lt_ECHO
  1991. -
  1992. --# The PATH separator for the build system.
  1993. --PATH_SEPARATOR=$lt_PATH_SEPARATOR
  1994. --
  1995. - # The host system.
  1996. - host_alias=$host_alias
  1997. - host=$host
  1998. -@@ -14047,6 +13880,10 @@ no_undefined_flag=$lt_no_undefined_flag
  1999. - # This must work even if \$libdir does not exist
  2000. - hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
  2001. -
  2002. -+# If ld is used when linking, flag to hardcode \$libdir into a binary
  2003. -+# during linking. This must work even if \$libdir does not exist.
  2004. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
  2005. -+
  2006. - # Whether we need a single "-rpath" flag with a separated argument.
  2007. - hardcode_libdir_separator=$lt_hardcode_libdir_separator
  2008. -
  2009. --- a/configure.ac
  2010. +++ b/configure.ac
  2011. -@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
  2012. +@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
  2013. if test -n "$kbuilddir"; then
  2014. AC_MSG_CHECKING([kernel version that we will build against])
  2015. -- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
  2016. -+ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
  2017. - kmajor="${krel%%[[^0-9]]*}";
  2018. - kmajor="$(($kmajor+0))";
  2019. - krel="${krel:${#kmajor}}";
  2020. +- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
  2021. ++ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
  2022. + save_IFS=$IFS;
  2023. + IFS='.';
  2024. + set x $krel;