diff --git a/sflphone-client-gnome/Makefile.am b/sflphone-client-gnome/Makefile.am
index 47bb88964f5c83a99f19899f9227d279eb1befb8..e8c86ca0787529348ee90f8d6841a1478098078b 100644
--- a/sflphone-client-gnome/Makefile.am
+++ b/sflphone-client-gnome/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src pixmaps tests man po doc
+SUBDIRS = src pixmaps tests man po
ACLOCAL_AMFLAGS = -I m4
diff --git a/sflphone-client-gnome/pixmaps/incoming.svg b/sflphone-client-gnome/pixmaps/incoming.svg
index 3cd35ac1499be20876f4cd79689549ef53b991bd..c47e04b5f558df05939b9acc4999370b2e286183 100644
--- a/sflphone-client-gnome/pixmaps/incoming.svg
+++ b/sflphone-client-gnome/pixmaps/incoming.svg
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -13,9 +14,8 @@
height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47pre4 r22446"
version="1.0"
- sodipodi:docbase="/home/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
sodipodi:docname="incoming.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true">
@@ -143,7 +143,7 @@
x2="-3.8121746"
y2="9.3760633"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.8262245,0,0,1.1530286,21.450158,0.7307096)" />
+ gradientTransform="matrix(-1.1171976,0,0,1.3356755,20.340918,-0.49566383)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2772"
@@ -171,10 +171,11 @@
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1920"
- inkscape:window-height="1123"
+ inkscape:window-height="1125"
inkscape:window-x="0"
inkscape:window-y="25"
- showgrid="false">
+ showgrid="false"
+ inkscape:window-maximized="1">
<sodipodi:guide
orientation="vertical"
position="16.970563,9.4575536"
@@ -196,57 +197,8 @@
inkscape:groupmode="layer"
id="layer1">
<path
- style="opacity:1;fill:url(#linearGradient2511);fill-opacity:1;stroke:none;stroke-width:0.625;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="M 24.599869,5.8821885 L 14.31552,5.8821885 L 14.31552,1.2188523 L 6.5292625,11.541578 L 14.31552,21.864303 L 14.31552,17.200965 L 24.599869,17.200965 L 24.599869,5.8821885 z"
+ style="fill:url(#linearGradient2511);fill-opacity:1;stroke:none"
+ d="m 24.599869,5.4718417 -13.906209,0 0,-5.40203797 L 0.16530119,12.027714 10.69366,23.985623 l 0,-5.40204 13.906209,0 0,-13.1117413 z"
id="rect4262" />
- <g
- id="g2364"
- inkscape:label="Calque 1"
- transform="matrix(0.7988192,0.4342103,-0.432441,0.795564,14.187414,0.5419157)">
- <g
- transform="translate(7.9455775,4.2707653)"
- inkscape:label="Calque 1"
- id="g2446">
- <g
- id="g2181"
- transform="matrix(-0.4376782,-0.758081,0.7581751,-0.4377326,3.5952686,30.820492)"
- style="fill:none;stroke:#000000;stroke-opacity:0.44968555">
- <path
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.65573961;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.44968555"
- d="M 41.109694,-0.41817229 C 40.505298,0.20454826 39.040867,0.77635346 37.592239,0.77635106 C 36.102089,0.77635106 34.114653,0.15682998 33.532659,-0.49267807 L 33.569913,-2.0031726 L 33.569913,-3.0835065 C 31.027414,-3.5787101 30.997014,-3.8285637 27.525623,-3.8285643 C 24.054233,-3.8285649 23.830777,-3.5759718 21.29017,-3.0462535 L 21.29017,-0.3436665 C 20.685773,0.27905404 19.221343,0.87609843 17.772714,0.87609724 C 16.282564,0.87609724 14.623294,0.43325774 13.915083,-0.41817229 L 14.138601,-5.7646408 C 18.129172,-7.3187814 22.030595,-8.3970767 27.437882,-8.5586077 C 32.38601,-8.450833 36.259126,-7.7053161 40.886177,-5.8763994 L 41.109694,-0.41817229 z"
- id="path2183"
- sodipodi:nodetypes="csccczccsccccc" />
- </g>
- <g
- id="g2451"
- transform="matrix(-0.4400595,-0.7622054,0.7622054,-0.4400595,-10.917299,27.830684)">
- <path
- sodipodi:nodetypes="cccsccsccsccc"
- id="path2453"
- d="M 16.100095,4.59375 C 10.946289,4.7477067 7.2256019,5.7999634 3.4220983,7.28125 L 3.2345983,10.227679 C 3.7846813,10.972881 5.0136533,11.508929 6.4220983,11.508929 C 7.7912983,11.508929 8.9758403,11.004648 9.5470983,10.290179 L 9.5470983,9.1875 C 11.968608,8.682612 12.862258,8.4375 16.125,8.4375 C 19.479577,8.4375001 20.38467,8.6842603 22.807982,9.15625 L 22.807982,10.165179 C 23.37924,10.879648 24.563781,11.383929 25.932982,11.383929 C 27.341427,11.383929 28.53915,10.847881 29.089232,10.102679 L 28.901732,7.15625 C 24.491586,5.413068 20.816266,4.6964725 16.100095,4.59375 z"
- style="opacity:1;fill:url(#linearGradient2483);fill-opacity:1;stroke:#0f5600;stroke-width:0.625;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2455"
- d="M 6.4075414,13.019293 C 7.7882612,13.019293 8.983936,12.610489 9.5600003,12.01696 L 9.5600003,10.430989 C 8.8231919,11.109285 7.789205,11.494948 6.4075414,11.494948 C 4.9854414,11.494948 3.9881276,11.13019 3.2127675,10.48174 L 3.2127675,11.966208 C 3.7674786,12.585269 4.9872465,13.019293 6.4075414,13.019293 z"
- style="opacity:1;fill:url(#linearGradient2485);fill-opacity:1;stroke:#0f5600;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2457"
- d="M 25.967532,12.944669 C 27.348252,12.944669 28.543927,12.535865 29.119991,11.942336 L 29.119991,10.356365 C 28.383183,11.034661 27.349196,11.420324 25.967532,11.420324 C 24.545432,11.420324 23.548118,11.055566 22.772758,10.407116 L 22.772758,11.891584 C 23.327469,12.510645 24.547237,12.944669 25.967532,12.944669 z"
- style="opacity:1;fill:url(#linearGradient2487);fill-opacity:1;stroke:#0f5600;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2459"
- d="M 6.6822725,11.157918 C 8.0629923,11.157918 8.7535908,10.73333 9.3296551,10.139801 L 9.0644746,7.3100024 C 8.3276662,7.9882984 8.1270706,8.5445024 6.745407,8.5445024 C 5.323307,8.5445024 4.4996132,8.1797444 3.7242531,7.5312944 L 3.4874986,10.104833 C 4.0422097,10.723894 5.2619776,11.157918 6.6822725,11.157918 z"
- style="opacity:1;fill:url(#linearGradient2489);fill-opacity:1;stroke:none;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2461"
- d="M 25.633599,11.055324 C 24.252879,11.055324 23.56228,10.630736 22.986216,10.037207 L 22.418005,7.3779497 C 23.154814,8.0562457 24.188801,8.4419087 25.570464,8.4419087 C 26.992564,8.4419087 27.816258,8.0771507 28.591618,7.4287007 L 28.828373,10.002239 C 28.273662,10.6213 27.053894,11.055324 25.633599,11.055324 z"
- style="opacity:1;fill:url(#linearGradient2491);fill-opacity:1;stroke:none;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- </g>
- </g>
- </g>
</g>
</svg>
diff --git a/sflphone-client-gnome/pixmaps/outgoing.svg b/sflphone-client-gnome/pixmaps/outgoing.svg
index aa0fb5e8866c172d7066efa8dbe317d26e773204..2c98df9e33540d3c41089daf8234cc66a8cc0376 100644
--- a/sflphone-client-gnome/pixmaps/outgoing.svg
+++ b/sflphone-client-gnome/pixmaps/outgoing.svg
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -13,10 +14,9 @@
height="24"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47pre4 r22446"
version="1.0"
- sodipodi:docbase="/home/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
- sodipodi:docname="outgoing.svg"
+ sodipodi:docname="incoming.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:modified="true">
<defs
@@ -72,27 +72,27 @@
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
- id="linearGradient3003">
+ id="linearGradient2772">
<stop
style="stop-color:#008000;stop-opacity:1;"
offset="0"
- id="stop3005" />
+ id="stop2774" />
<stop
style="stop-color:#008000;stop-opacity:0;"
offset="1"
- id="stop3007" />
+ id="stop2776" />
</linearGradient>
<linearGradient
inkscape:collect="always"
- id="linearGradient2607">
+ id="linearGradient2505">
<stop
style="stop-color:#008000;stop-opacity:1;"
offset="0"
- id="stop2609" />
+ id="stop2507" />
<stop
style="stop-color:#008000;stop-opacity:0;"
offset="1"
- id="stop2611" />
+ id="stop2509" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
@@ -136,22 +136,22 @@
</linearGradient>
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient2607"
- id="linearGradient2613"
- x1="8.7504473"
- y1="9.6810875"
- x2="26.544411"
- y2="9.906394"
+ xlink:href="#linearGradient2505"
+ id="linearGradient2511"
+ x1="17.620802"
+ y1="9.4159222"
+ x2="-3.8121746"
+ y2="9.3760633"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.8560405,0,0,1.1184736,0.9045039,6.3789889e-2)" />
+ gradientTransform="matrix(1.1171849,-0.00531668,-0.0063564,-1.3356604,3.7768335,24.412045)" />
<linearGradient
inkscape:collect="always"
- xlink:href="#linearGradient3003"
- id="linearGradient3009"
- x1="29.820433"
- y1="2.1517653"
- x2="-5.1534119"
- y2="5.9291029"
+ xlink:href="#linearGradient2772"
+ id="linearGradient2778"
+ x1="26.420586"
+ y1="3.4565225"
+ x2="20.291727"
+ y2="-5.2758617"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
@@ -163,21 +163,22 @@
inkscape:pageshadow="2"
inkscape:zoom="11.313708"
inkscape:cx="18.87396"
- inkscape:cy="2.756874"
+ inkscape:cy="2.5800973"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="32px"
height="32px"
showguides="true"
inkscape:guide-bbox="true"
- inkscape:window-width="1331"
- inkscape:window-height="922"
- inkscape:window-x="169"
+ inkscape:window-width="1920"
+ inkscape:window-height="1125"
+ inkscape:window-x="0"
inkscape:window-y="25"
- showgrid="false">
+ showgrid="false"
+ inkscape:window-maximized="1">
<sodipodi:guide
orientation="vertical"
- position="15.982143"
+ position="16.970563,9.4575536"
id="guide3146" />
</sodipodi:namedview>
<metadata
@@ -188,6 +189,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -196,57 +198,8 @@
inkscape:groupmode="layer"
id="layer1">
<path
- style="opacity:1;fill:url(#linearGradient2613);fill-opacity:1;stroke:none;stroke-width:0.625;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="M 8.3854173,5.6540458 L 17.06005,5.6540458 L 17.06005,1.1304639 L 23.627595,11.14383 L 17.06005,21.157198 L 17.06005,16.633614 L 8.3854173,16.633614 L 8.3854173,5.6540458 z"
+ style="fill:url(#linearGradient2511);fill-opacity:1;stroke:none"
+ d="m -0.51046827,18.464875 13.90605127,-0.06618 0.02571,5.401977 10.471333,-12.007879 -10.585147,-11.90766905 0.02571,5.40197885 -13.90605127,0.066179 0.062398,13.1115924 z"
id="rect4262" />
- <g
- id="g2364"
- inkscape:label="Calque 1"
- transform="matrix(0.8084692,0.4159668,-0.4142718,0.8051747,13.838027,0.5188541)">
- <g
- transform="translate(7.9455775,4.2707653)"
- inkscape:label="Calque 1"
- id="g2446">
- <g
- id="g2181"
- transform="matrix(-0.4376782,-0.758081,0.7581751,-0.4377326,3.5952686,30.820492)"
- style="fill:none;stroke:#000000;stroke-opacity:0.44968555">
- <path
- style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.65573961;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.44968555"
- d="M 41.109694,-0.41817229 C 40.505298,0.20454826 39.040867,0.77635346 37.592239,0.77635106 C 36.102089,0.77635106 34.114653,0.15682998 33.532659,-0.49267807 L 33.569913,-2.0031726 L 33.569913,-3.0835065 C 31.027414,-3.5787101 30.997014,-3.8285637 27.525623,-3.8285643 C 24.054233,-3.8285649 23.830777,-3.5759718 21.29017,-3.0462535 L 21.29017,-0.3436665 C 20.685773,0.27905404 19.221343,0.87609843 17.772714,0.87609724 C 16.282564,0.87609724 14.623294,0.43325774 13.915083,-0.41817229 L 14.138601,-5.7646408 C 18.129172,-7.3187814 22.030595,-8.3970767 27.437882,-8.5586077 C 32.38601,-8.450833 36.259126,-7.7053161 40.886177,-5.8763994 L 41.109694,-0.41817229 z"
- id="path2183"
- sodipodi:nodetypes="csccczccsccccc" />
- </g>
- <g
- id="g2451"
- transform="matrix(-0.4400595,-0.7622054,0.7622054,-0.4400595,-10.917299,27.830684)">
- <path
- sodipodi:nodetypes="cccsccsccsccc"
- id="path2453"
- d="M 16.100095,4.59375 C 10.946289,4.7477067 7.2256019,5.7999634 3.4220983,7.28125 L 3.2345983,10.227679 C 3.7846813,10.972881 5.0136533,11.508929 6.4220983,11.508929 C 7.7912983,11.508929 8.9758403,11.004648 9.5470983,10.290179 L 9.5470983,9.1875 C 11.968608,8.682612 12.862258,8.4375 16.125,8.4375 C 19.479577,8.4375001 20.38467,8.6842603 22.807982,9.15625 L 22.807982,10.165179 C 23.37924,10.879648 24.563781,11.383929 25.932982,11.383929 C 27.341427,11.383929 28.53915,10.847881 29.089232,10.102679 L 28.901732,7.15625 C 24.491586,5.413068 20.816266,4.6964725 16.100095,4.59375 z"
- style="opacity:1;fill:url(#linearGradient2483);fill-opacity:1;stroke:#0f5600;stroke-width:0.625;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2455"
- d="M 6.4075414,13.019293 C 7.7882612,13.019293 8.983936,12.610489 9.5600003,12.01696 L 9.5600003,10.430989 C 8.8231919,11.109285 7.789205,11.494948 6.4075414,11.494948 C 4.9854414,11.494948 3.9881276,11.13019 3.2127675,10.48174 L 3.2127675,11.966208 C 3.7674786,12.585269 4.9872465,13.019293 6.4075414,13.019293 z"
- style="opacity:1;fill:url(#linearGradient2485);fill-opacity:1;stroke:#0f5600;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2457"
- d="M 25.967532,12.944669 C 27.348252,12.944669 28.543927,12.535865 29.119991,11.942336 L 29.119991,10.356365 C 28.383183,11.034661 27.349196,11.420324 25.967532,11.420324 C 24.545432,11.420324 23.548118,11.055566 22.772758,10.407116 L 22.772758,11.891584 C 23.327469,12.510645 24.547237,12.944669 25.967532,12.944669 z"
- style="opacity:1;fill:url(#linearGradient2487);fill-opacity:1;stroke:#0f5600;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2459"
- d="M 6.6822725,11.157918 C 8.0629923,11.157918 8.7535908,10.73333 9.3296551,10.139801 L 9.0644746,7.3100024 C 8.3276662,7.9882984 8.1270706,8.5445024 6.745407,8.5445024 C 5.323307,8.5445024 4.4996132,8.1797444 3.7242531,7.5312944 L 3.4874986,10.104833 C 4.0422097,10.723894 5.2619776,11.157918 6.6822725,11.157918 z"
- style="opacity:1;fill:url(#linearGradient2489);fill-opacity:1;stroke:none;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="cccsccc"
- id="path2461"
- d="M 25.633599,11.055324 C 24.252879,11.055324 23.56228,10.630736 22.986216,10.037207 L 22.418005,7.3779497 C 23.154814,8.0562457 24.188801,8.4419087 25.570464,8.4419087 C 26.992564,8.4419087 27.816258,8.0771507 28.591618,7.4287007 L 28.828373,10.002239 C 28.273662,10.6213 27.053894,11.055324 25.633599,11.055324 z"
- style="opacity:1;fill:url(#linearGradient2491);fill-opacity:1;stroke:none;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- </g>
- </g>
- </g>
</g>
</svg>
diff --git a/sflphone-client-gnome/sflphone.desktop.in b/sflphone-client-gnome/sflphone.desktop.in
index f621e8a166a35065184b98aa2088285c9afa6205..606bc1f53a0a35faa3fd3d17ae2e0b449f3fb306 100644
--- a/sflphone-client-gnome/sflphone.desktop.in
+++ b/sflphone-client-gnome/sflphone.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=SFLphone GNOME VoIP client
+Name=VoIP Client SFLphone
GenericName=Telephone
Comment=Call and receive calls with SIP or IAX protocols
Exec=sflphone-client-gnome
diff --git a/sflphone-client-gnome/src/accountlist.c b/sflphone-client-gnome/src/accountlist.c
index bd8621c6949230ee0534ba3f6a8f2ef9e1ef530b..6a7e9d7a16329138751b139ba1ce7aaa8b6e270e 100644
--- a/sflphone-client-gnome/src/accountlist.c
+++ b/sflphone-client-gnome/src/accountlist.c
@@ -328,7 +328,7 @@ guint account_list_get_position (account_t *account)
return -1;
}
-gboolean account_list_current_account_has_mailbox (void)
+gboolean current_account_has_mailbox (void)
{
account_t *current;
@@ -345,3 +345,38 @@ gboolean account_list_current_account_has_mailbox (void)
return FALSE;
}
+void current_account_set_message_number (guint nb)
+{
+ account_t *current;
+
+ current = account_list_get_current ();
+ if (current)
+ {
+ current->_messages_number = nb;
+ }
+}
+
+guint current_account_get_message_number (void)
+{
+ account_t *current;
+
+ current = account_list_get_current ();
+ if (current)
+ {
+ return current->_messages_number;
+ }
+ else
+ return 0;
+}
+
+gboolean current_account_has_new_message (void)
+{
+ account_t *current;
+
+ current = account_list_get_current ();
+ if (current)
+ {
+ return (current->_messages_number > 0);
+ }
+ return FALSE;
+}
diff --git a/sflphone-client-gnome/src/accountlist.h b/sflphone-client-gnome/src/accountlist.h
index 346f87cc79d7346c37ce0f98df7def6046d55fe7..cf87d3ca8e4bd22b16c06c047bc3f786eae37a92 100644
--- a/sflphone-client-gnome/src/accountlist.h
+++ b/sflphone-client-gnome/src/accountlist.h
@@ -70,6 +70,9 @@ typedef struct {
guint protocol_state_code;
GHashTable * properties;
GPtrArray * credential_information;
+
+ guint _messages_number;
+
} account_t;
@@ -192,4 +195,10 @@ guint account_list_get_position (account_t *account);
gboolean account_list_current_account_has_mailbox (void);
+guint current_account_get_message_number (void);
+
+void current_account_set_message_number (guint nb);
+
+gboolean current_account_has_new_message (void);
+
#endif
diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index ae8d5e3fdb8cb8d404d29a195cae1ee35dea58bb..1cad4d868eef52b2b48a03a51545f747cf7535c8 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -31,37 +31,31 @@
#include <sys/types.h>
#include <unistd.h>
-guint voice_mails;
GHashTable * ip2ip_profile=NULL;
void
-sflphone_notify_voice_mail ( const gchar* accountID , guint count )
+sflphone_notify_voice_mail (const gchar* accountID , guint count)
{
gchar *id;
- gchar *current;
+ gchar *current_id;
+ account_t *current;
- // We want to notify only for the default current account; ie the first in the list
- id = g_strdup( accountID );
- current = account_list_get_current_id();
- if( strcmp( id, current ) != 0 )
+ // We want to notify only the current account; ie the first in the list
+ id = g_strdup (accountID);
+ current_id = account_list_get_current_id ();
+
+ if (g_strcasecmp (id, current_id) != 0 || account_list_get_size() == 0)
return;
- voice_mails = count ;
+ // Set the number of voice messages for the current account
+ current_account_set_message_number (count);
+ current = account_list_get_current ();
- if(count > 0)
- {
- gchar * message = g_strdup_printf(n_("%d voice mail", "%d voice mails", count), count);
- statusbar_push_message(message, __MSG_VOICE_MAILS);
- g_free(message);
- }
+ // Update the voicemail tool button
+ update_voicemail_status ();
- // TODO: add ifdef
- if( account_list_get_size() > 0 )
- {
- account_t* acc = account_list_get_by_id( id );
- if( acc != NULL )
- notify_voice_mails( count , acc );
- }
+ if (current)
+ notify_voice_mails (count, current);
}
void
@@ -157,6 +151,9 @@ sflphone_fill_account_list(gboolean toolbarInitialized)
gchar** array;
gchar** accountID;
unsigned int i;
+ int count;
+
+ count = current_account_get_message_number ();
account_list_clear ( );
@@ -251,6 +248,9 @@ sflphone_fill_account_list(gboolean toolbarInitialized)
a->protocol_state_description = g_hash_table_lookup(details, REGISTRATION_STATE_DESCRIPTION);
}
+ // Reset the current account message number
+ current_account_set_message_number (count);
+
// Prevent update being called when toolbar is not yet initialized
if(toolbarInitialized)
update_actions ();
@@ -635,7 +635,7 @@ sflphone_new_call()
// Play a tone when creating a new call
if( calllist_get_size(current_calls) == 0 )
- dbus_start_tone( TRUE , ( voice_mails > 0 )? TONE_WITH_MESSAGE : TONE_WITHOUT_MESSAGE) ;
+ dbus_start_tone( TRUE , (current_account_has_new_message () > 0)? TONE_WITH_MESSAGE : TONE_WITHOUT_MESSAGE) ;
peer_number = g_strdup("");
peer_name = g_strdup ("");
@@ -870,6 +870,8 @@ static int _place_registered_call(callable_obj_t * c) {
void
sflphone_place_call ( callable_obj_t * c )
{
+ gchar *msg = "";
+
DEBUG("Placing call with %s @ %s and accountid %s", c->_peer_name, c->_peer_number, c->_accountID);
if(c == NULL) {
@@ -878,6 +880,10 @@ sflphone_place_call ( callable_obj_t * c )
}
if(_is_direct_call(c)) {
+ msg = g_markup_printf_escaped (_("Direct SIP call"));
+ statusbar_pop_message(__MSG_ACCOUNT_DEFAULT);
+ statusbar_push_message( msg , __MSG_ACCOUNT_DEFAULT);
+ g_free(msg);
if(_place_direct_call(c) < 0) {
DEBUG("An error occured while placing direct call in %s at %d", __FILE__, __LINE__);
return;
@@ -890,50 +896,6 @@ sflphone_place_call ( callable_obj_t * c )
}
}
- void
-sflphone_display_selected_codec (const gchar* codecName)
-{
-
- callable_obj_t * selectedCall;
- gchar* msg;
- account_t* acc;
-
- selectedCall = calltab_get_selected_call(current_calls);
- if (selectedCall) {
- if(selectedCall->_accountID != NULL){
- statusbar_pop_message(__MSG_ACCOUNT_DEFAULT);
- acc = account_list_get_by_id(selectedCall->_accountID);
- if (!acc) {
- msg = g_markup_printf_escaped (_("IP call - %s"), codecName);
- }
- else {
-
- if (strcmp(codecName, "") != 0) {
- msg = g_markup_printf_escaped("%s %s (%s) - %s %s" ,
- _("Using account"),
- (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
- (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE),
- _("Codec"),
- codecName);
- } else {
- msg = g_markup_printf_escaped("%s %s (%s)" ,
- _("Using account"),
- (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_ALIAS),
- (gchar*)g_hash_table_lookup( acc->properties , ACCOUNT_TYPE));
- }
- }
- statusbar_push_message( msg , __MSG_ACCOUNT_DEFAULT);
- g_free(msg);
- }
- }
-}
-
- gchar*
-sflphone_get_current_codec_name()
-{
- callable_obj_t * selectedCall = calltab_get_selected_call(current_calls);
- return dbus_get_current_codec_name(selectedCall);
-}
void
sflphone_detach_participant(const gchar* callID)
@@ -1126,6 +1088,8 @@ void sflphone_fill_call_list (void)
callable_obj_t *c;
gchar *callID;
+ DEBUG("sflphone_fill_call_list");
+
if(calls)
{
for(pl=calls; *calls; calls++)
@@ -1148,31 +1112,38 @@ void sflphone_fill_call_list (void)
void sflphone_fill_conference_list(void)
{
- // TODO Fetch the active conferences at client startup
- /*
- gchar** conferences = (gchar**)dbus_get_conference_list();
+ // TODO Fetch the active conferences at client startup
+
+ gchar** conferences;
gchar** pl;
GHashTable *conference_details;
gchar* conf_id;
- conference_obj_t* c;
+ conference_obj_t* conf;
DEBUG("sflphone_fill_conference_list");
+ conferences = dbus_get_conference_list();
+
if(conferences)
{
for (pl = conferences; *conferences; conferences++)
{
- c = g_new0(conference_obj_t, 1);
+ conf = g_new0(conference_obj_t, 1);
conf_id = (gchar*)(*conferences);
+ DEBUG(" fetching conference: %s", conf_id);
+
conference_details = (GHashTable*) dbus_get_conference_details(conf_id);
- create_new_call_from_details (conf_id, conference_details, &c);
- c->_confID = g_strdup(conf_id);
+
+ create_new_conference_from_details (conf_id, conference_details, &conf);
+
+ conf->_confID = g_strdup(conf_id);
- conferencelist_add(c);
+ conferencelist_add(conf);
+ calltree_add_conference (current_calls, conf);
}
}
- */
+
}
void sflphone_fill_history (void)
diff --git a/sflphone-client-gnome/src/actions.h b/sflphone-client-gnome/src/actions.h
index 37db1185ea94ea619a93beac9de31b44b1290fba..2365243748bf9792fe31051dd71f68446d897160 100644
--- a/sflphone-client-gnome/src/actions.h
+++ b/sflphone-client-gnome/src/actions.h
@@ -185,10 +185,6 @@ void sflphone_record (callable_obj_t *c);
void sflphone_rec_call (void);
-gchar* sflphone_get_current_codec_name();
-
-void sflphone_display_selected_codec (const gchar* codecName);
-
void status_bar_display_account ();
void sflphone_fill_history (void);
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index adab9d2ba923897478c297802cfec4dc2cc1c93b..abf900dc1c8283d1c36b05c1dc31352c839f6e74 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -18,6 +18,7 @@
*/
#include <callable_obj.h>
+#include <codeclist.h>
#include <sflphone_const.h>
#include <time.h>
@@ -78,6 +79,24 @@ gchar* call_get_peer_number (const gchar *format)
return number;
}
+gchar* call_get_audio_codec (callable_obj_t *obj)
+{
+ gchar *audio_codec = "";
+ codec_t *codec;
+ gchar *format ="";
+ int samplerate;
+
+ if (obj)
+ {
+ audio_codec = dbus_get_current_codec_name (obj);
+ codec = codec_list_get_by_name (audio_codec);
+ if (codec){
+ samplerate = codec->sample_rate;
+ format = g_markup_printf_escaped ("%s/%i", audio_codec, samplerate);
+ }
+ }
+ return format;
+}
void call_add_error(callable_obj_t * call, gpointer dialog)
{
@@ -137,7 +156,7 @@ void create_new_call_from_details (const gchar *call_id, GHashTable *details, ca
accountID = g_hash_table_lookup (details, "ACCOUNTID");
peer_number = g_hash_table_lookup (details, "PEER_NUMBER");
- peer_name = g_strdup ("");
+ peer_name = g_hash_table_lookup (details, "DISPLAY_NAME");
state_str = g_hash_table_lookup (details, "CALL_STATE");
diff --git a/sflphone-client-gnome/src/callable_obj.h b/sflphone-client-gnome/src/callable_obj.h
index d23bc90cae333e7355b0f4984d9fdc31db4c6b2f..21311d8da72c9b81402a58b637883d13a421ffc6 100644
--- a/sflphone-client-gnome/src/callable_obj.h
+++ b/sflphone-client-gnome/src/callable_obj.h
@@ -135,6 +135,9 @@ typedef struct {
*/
GPtrArray * _error_dialogs;
+ /* The audio codec used for this call, if applicable */
+ gchar *_audio_codec;
+
} callable_obj_t;
void create_new_call (callable_type_t, call_state_t, gchar*, gchar*, gchar*, gchar*, callable_obj_t **);
@@ -205,5 +208,6 @@ gchar* convert_timestamp_to_gchar (time_t);
time_t convert_gchar_to_timestamp (gchar*);
+gchar* call_get_audio_codec (callable_obj_t *obj);
#endif
diff --git a/sflphone-client-gnome/src/conference_obj.c b/sflphone-client-gnome/src/conference_obj.c
index 039f01f73ef0a81727fa4a2289f73ab9b22b5d61..146bd3050ff5d570b9409e68fa1bed7d73eb6603 100644
--- a/sflphone-client-gnome/src/conference_obj.c
+++ b/sflphone-client-gnome/src/conference_obj.c
@@ -34,63 +34,118 @@ gint is_confID_confstruct ( gconstpointer a, gconstpointer b)
}
}
-void create_new_conference (conference_state_t state, const gchar* confID, conference_obj_t ** new_conf)
+conference_obj_t* create_new_conference (conference_state_t state, const gchar* confID, conference_obj_t ** conf)
{
+ DEBUG("create_new_conference");
- conference_obj_t *obj;
- gchar* conf_id;
+ // conference_obj_t *obj;
+ conference_obj_t *new_conf;
+ const gchar* conf_id;
// Allocate memory
- obj = g_new0 (conference_obj_t, 1);
+ new_conf = g_new0 (conference_obj_t, 1);
// Set state field
- obj->_state = state;
+ new_conf->_state = state;
// Set the ID field
- conf_id = confID;
- obj->_confID = g_strdup (conf_id);
- *new_conf = obj;
-
+ conf_id = confID;
+ new_conf->_confID = g_strdup (conf_id);
+
+ new_conf->participant_list = NULL;
+
+ *conf = new_conf;
+
}
-void create_new_conference_from_details (const gchar *conf_id, GHashTable *details, conference_obj_t *conf)
-{
- /*
- gchar *peer_name, *peer_number, *accountID, *state_str;
- callable_obj_t *new_call;
- call_state_t state;
+conference_obj_t* create_new_conference_from_details (const gchar *conf_id, GHashTable *details, conference_obj_t ** conf)
+{
+ DEBUG("create_new_conference_from_details");
- accountID = g_hash_table_lookup (details, "ACCOUNTID");
- peer_number = g_hash_table_lookup (details, "PEER_NUMBER");
- peer_name = g_strdup ("");
- state_str = g_hash_table_lookup (details, "CALL_STATE");
+ conference_obj_t *new_conf;
+ gchar* call_id;
+ gchar** participants;
+ gchar** part;
+ gchar* state_str;
+ // GSList* participant_list;
+ // Allocate memory
+ new_conf = g_new0 (conference_obj_t, 1);
- if (g_strcasecmp (state_str, "CURRENT") == 0)
- state = CALL_STATE_CURRENT;
+ new_conf->_confID = g_strdup (conf_id);
- else if (g_strcasecmp (state_str, "RINGING") == 0)
- state = CALL_STATE_RINGING;
+ new_conf->_conference_secured = FALSE;
+ new_conf->_conf_srtp_enabled = FALSE;
- else if (g_strcasecmp (state_str, "INCOMING") == 0)
- state = CALL_STATE_INCOMING;
+ new_conf->participant_list = NULL;
- else if (g_strcasecmp (state_str, "HOLD") == 0)
- state = CALL_STATE_HOLD;
+ // get participant list
+ participants = dbus_get_participant_list(conf_id);
- else if (g_strcasecmp (state_str, "BUSY") == 0)
- state = CALL_STATE_BUSY;
+ // generate conference participant list
+ conference_participant_list_update(participants, new_conf);
+
+ state_str = g_hash_table_lookup (details, "CONF_STATE");
- else
- state = CALL_STATE_FAILURE;
+ if (g_strcasecmp (state_str, "ACTIVE_ATACHED") == 0)
+ new_conf->_state = CONFERENCE_STATE_ACTIVE_ATACHED;
- create_new_call (CALL, state, (gchar*)call_id, accountID, peer_name, peer_number, &new_call);
- *call = new_call;
- */
+ else if (g_strcasecmp (state_str, "ACTIVE_DETACHED") == 0)
+ new_conf->_state = CONFERENCE_STATE_ACTIVE_DETACHED;
+
+ else if (g_strcasecmp (state_str, "HOLD") == 0)
+ new_conf->_state = CONFERENCE_STATE_HOLD;
+
+ *conf = new_conf;
}
void free_conference_obj_t (conference_obj_t *c)
{
g_free (c->_confID);
+
+ if(c->participant_list)
+ g_slist_free (c->participant_list);
+
g_free (c);
}
+
+
+void conference_add_participant(const gchar* call_id, conference_obj_t* conf)
+{
+ // store the new participant list after appending participant id
+ conf->participant_list = g_slist_append(conf->participant_list, (gpointer)call_id);
+}
+
+
+void conference_remove_participant(const gchar* call_id, conference_obj_t* conf)
+{
+ // store the new participant list after removing participant id
+ conf->participant_list = g_slist_remove(conf->participant_list, (gconstpointer)call_id);
+}
+
+
+GSList* conference_next_participant(GSList* participant)
+{
+ return g_slist_next(participant);
+}
+
+
+GSList* conference_participant_list_update(gchar** participants, conference_obj_t* conf)
+{
+ gchar* call_id;
+ gchar** part;
+
+ if(conf->participant_list) {
+ g_slist_free(conf->participant_list);
+ conf->participant_list = NULL;
+ }
+
+ DEBUG("conference_participant_list_update\n");
+
+ for (part = participants; *part; part++) {
+ call_id = (gchar*)(*part);
+ DEBUG(" adding %s", call_id);
+ conference_add_participant(call_id, conf);
+ }
+
+}
diff --git a/sflphone-client-gnome/src/conference_obj.h b/sflphone-client-gnome/src/conference_obj.h
index a54e68b64d561e05e6187ba4006311d389855514..1ac8016145b964f2eab8ba4368532e91e1f5ae57 100644
--- a/sflphone-client-gnome/src/conference_obj.h
+++ b/sflphone-client-gnome/src/conference_obj.h
@@ -49,13 +49,13 @@ typedef struct {
gchar* _confID; // The call ID
gboolean _conference_secured; // the security state of the conference
gboolean _conf_srtp_enabled; // security required for this conference
- gchar** participant; // participant list for this
+ GSList* participant_list; // participant list for this
} conference_obj_t;
-void create_new_conference (conference_state_t, const gchar*, conference_obj_t **);
+conference_obj_t* create_new_conference (conference_state_t, const gchar*, conference_obj_t **);
-void create_new_conference_from_details (const gchar *, GHashTable *, conference_obj_t *);
+conference_obj_t* create_new_conference_from_details (const gchar *, GHashTable *, conference_obj_t **);
void free_conference_obj_t (conference_obj_t *c);
@@ -64,4 +64,12 @@ void free_conference_obj_t (conference_obj_t *c);
*/
gint is_confID_confstruct ( gconstpointer, gconstpointer);
+void conference_add_participatn(const gchar*, conference_obj_t *);
+
+void conference_remove_participant(const gchar*, conference_obj_t *);
+
+GSList* conference_next_participant(GSList* participant);
+
+GSList* conference_participant_list_update(gchar**, conference_obj_t*);
+
#endif
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index a63ca9f936aa17abfc4f2b809c1c4bd82cd55e97..550019774a52be16a6cb66825d48a76f93377547 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -718,8 +718,7 @@ GtkWidget * create_advanced_tab(account_t **a)
DEBUG("Interface %s", *iface);
gtk_list_store_append(ipInterfaceListStore, &iter );
gtk_list_store_set(ipInterfaceListStore, &iter, 0, *iface, -1 );
-
- current_local_address_iter = iter;
+
if (g_strcmp0(*iface, local_address) == 0) {
DEBUG("Setting active local address combo box");
current_local_address_iter = iter;
diff --git a/sflphone-client-gnome/src/config/assistant.c b/sflphone-client-gnome/src/config/assistant.c
index 1f62ab5617eb47816479acaebfeac86027af2821..f9431a66ae05e7072a6bee8dde288b42e541db12 100644
--- a/sflphone-client-gnome/src/config/assistant.c
+++ b/sflphone-client-gnome/src/config/assistant.c
@@ -147,14 +147,27 @@ static void sip_apply_callback( void ) {
g_hash_table_insert(current->properties, g_strdup(ACCOUNT_ZRTP_HELLO_HASH), g_strdup((gchar *)"true"));
g_hash_table_insert(current->properties, g_strdup(ACCOUNT_DISPLAY_SAS_ONCE), g_strdup((gchar *)"false"));
}
-
- dbus_add_account( current );
- getMessageSummary(message,
- gtk_entry_get_text (GTK_ENTRY(wiz->sip_alias)),
- gtk_entry_get_text (GTK_ENTRY(wiz->sip_server)),
- gtk_entry_get_text (GTK_ENTRY(wiz->sip_username)),
- (gboolean)(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wiz->zrtp_enable)))
- );
+
+
+ // Add default interface info
+ gchar ** iface_list = NULL;
+ iface_list = (gchar**) dbus_get_all_ip_interface();
+ gchar ** iface = NULL;
+
+ // select the first interface available
+ iface = iface_list;
+ DEBUG("Selected interface %s", *iface);
+
+ g_hash_table_insert(current->properties, g_strdup(LOCAL_ADDRESS), g_strdup((gchar *)*iface));
+ g_hash_table_insert(current->properties, g_strdup(PUBLISHED_ADDRESS), g_strdup((gchar *)*iface));
+
+ dbus_add_account( current );
+ getMessageSummary(message,
+ gtk_entry_get_text (GTK_ENTRY(wiz->sip_alias)),
+ gtk_entry_get_text (GTK_ENTRY(wiz->sip_server)),
+ gtk_entry_get_text (GTK_ENTRY(wiz->sip_username)),
+ (gboolean)(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wiz->zrtp_enable)))
+ );
gtk_label_set_text (GTK_LABEL(wiz->label_summary), message);
}
diff --git a/sflphone-client-gnome/src/config/audioconf.c b/sflphone-client-gnome/src/config/audioconf.c
index b72c0beb79c9b8950f81066441e4fda2c4816726..8d3a55c7d40bee20bc371fad3fb88aa2c3dc340d 100644
--- a/sflphone-client-gnome/src/config/audioconf.c
+++ b/sflphone-client-gnome/src/config/audioconf.c
@@ -35,7 +35,6 @@ GtkWidget *pulse;
GtkWidget *alsabox;
GtkWidget *alsa_conf;
GtkWidget *noise_conf;
-GtkWidget *pa_mute_widget;
// Codec properties ID
enum {
@@ -630,7 +629,6 @@ select_audio_manager( void )
gtk_container_add( GTK_CONTAINER(alsa_conf ) , alsabox);
gtk_widget_show( alsa_conf );
gtk_widget_set_sensitive(GTK_WIDGET(alsa_conf), TRUE);
- gtk_widget_set_sensitive(GTK_WIDGET(pa_mute_widget), FALSE);
gtk_action_set_sensitive (GTK_ACTION (volumeToggle), TRUE);
}
@@ -640,7 +638,6 @@ select_audio_manager( void )
DEBUG(" remove alsa conf panel");
gtk_container_remove( GTK_CONTAINER(alsa_conf) , alsabox );
gtk_widget_hide( alsa_conf );
- gtk_widget_set_sensitive(GTK_WIDGET(pa_mute_widget), TRUE);
if (gtk_toggle_action_get_active ( GTK_TOGGLE_ACTION (volumeToggle)))
{
main_window_volume_controls(FALSE);
@@ -813,12 +810,6 @@ GtkWidget* create_audio_configuration()
g_signal_connect(G_OBJECT(alsa), "clicked", G_CALLBACK(select_audio_manager), NULL);
gtk_table_attach ( GTK_TABLE( table ), alsa, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
- pa_mute_widget = gtk_check_button_new_with_mnemonic(_("_Mute other applications during a call"));
- gtk_widget_set_sensitive(pa_mute_widget, pulse_audio);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pa_mute_widget), (g_strcasecmp (dbus_get_pulse_app_volume_control(), "true") == 0)? TRUE: FALSE);
- g_signal_connect(G_OBJECT( pa_mute_widget ) , "clicked" , G_CALLBACK( dbus_set_pulse_app_volume_control ) , NULL);
- gtk_table_attach( GTK_TABLE(table), pa_mute_widget, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
-
// Box for the ALSA configuration
gnome_main_section_new (_("ALSA settings"), &alsa_conf);
gtk_box_pack_start(GTK_BOX(ret), alsa_conf, FALSE, FALSE, 0);
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.c b/sflphone-client-gnome/src/config/preferencesdialog.c
index 6e3c29a007a36b33b01e9fdc8c4418214983d8ce..5f9954b68a63d11694eb7113dfe3ec6ca42c140a 100644
--- a/sflphone-client-gnome/src/config/preferencesdialog.c
+++ b/sflphone-client-gnome/src/config/preferencesdialog.c
@@ -52,8 +52,6 @@ GtkWidget * status;
static int history_limit;
static gboolean history_enabled = TRUE;
-// Mail notification
-GtkWidget * widg;
GHashTable * directIpCallsProperties = NULL;
@@ -87,20 +85,6 @@ set_popup_mode( void )
set_notif_level( )
{
dbus_set_notify();
-
- if (dbus_get_notify())
- gtk_widget_set_sensitive(widg, TRUE);
- else {
- gtk_widget_set_sensitive(widg, FALSE);
- if (dbus_get_mail_notify())
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widg), FALSE);
- }
-}
-
- void
-set_mail_notif( )
-{
- dbus_set_mail_notify( );
}
static void history_limit_cb (GtkSpinButton *button, void *ptr)
@@ -326,18 +310,6 @@ create_general_settings ()
g_signal_connect(G_OBJECT( notifAll ) , "clicked" , G_CALLBACK( set_notif_level ) , NULL );
gtk_table_attach( GTK_TABLE(table), notifAll, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
- // Notification
- widg = gtk_check_button_new_with_mnemonic( _("Enable voicemail _notifications"));
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(widg), dbus_get_mail_notify() );
- g_signal_connect(G_OBJECT( widg ) , "clicked" , G_CALLBACK( set_mail_notif ) , NULL);
- gtk_table_attach( GTK_TABLE(table), widg, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 5);
-
-
- if (dbus_get_notify())
- gtk_widget_set_sensitive(widg, TRUE);
- else
- gtk_widget_set_sensitive(widg, FALSE);
-
// System Tray option frame
gnome_main_section_new_with_table (_("System Tray Icon"), &frame, &table, 3, 1);
gtk_box_pack_start(GTK_BOX(ret), frame, FALSE, FALSE, 0);
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 1157b5f630847a3b016fe992173f0a38f46ace0c..fd84153eba3290718b1788fc8d8627db91951b2e 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -162,61 +162,59 @@ row_activated(GtkTreeView *tree_view UNUSED,
DEBUG("double click action");
- if(calltab_get_selected_type(active_calltree) == A_CALL)
- {
-
- DEBUG("Selected a call\n");
- selectedCall = calltab_get_selected_call(active_calltree);
-
- if (selectedCall)
- {
- DEBUG("there is a selected call\n");
+ if(calltab_get_selected_type(active_calltree) == A_CALL) {
- // Get the right event from the right calltree
- if( active_calltree == current_calls )
- {
-
- DEBUG("active tree is current calls");
+ DEBUG("Selected a call\n");
+ selectedCall = calltab_get_selected_call(active_calltree);
- switch(selectedCall->_state)
- {
- case CALL_STATE_INCOMING:
- dbus_accept(selectedCall);
- stop_notification();
- break;
- case CALL_STATE_HOLD:
- dbus_unhold(selectedCall);
- break;
- case CALL_STATE_RINGING:
- case CALL_STATE_CURRENT:
- case CALL_STATE_BUSY:
- case CALL_STATE_FAILURE:
- break;
- case CALL_STATE_DIALING:
- sflphone_place_call (selectedCall);
- break;
- default:
- WARN("Row activated - Should not happen!");
- break;
- }
- }
+ if (selectedCall)
+ {
+ DEBUG("there is a selected call\n");
- // If history or contact: double click action places a new call
- else
- {
- DEBUG("active tree is history or contact");
+ // Get the right event from the right calltree
+ if( active_calltree == current_calls )
+ {
- account_id = g_strdup (selectedCall->_accountID);
+ DEBUG("active tree is current calls");
+
+ switch(selectedCall->_state) {
+ case CALL_STATE_INCOMING:
+ dbus_accept(selectedCall);
+ stop_notification();
+ break;
+ case CALL_STATE_HOLD:
+ dbus_unhold(selectedCall);
+ break;
+ case CALL_STATE_RINGING:
+ case CALL_STATE_CURRENT:
+ case CALL_STATE_BUSY:
+ case CALL_STATE_FAILURE:
+ break;
+ case CALL_STATE_DIALING:
+ sflphone_place_call (selectedCall);
+ break;
+ default:
+ WARN("Row activated - Should not happen!");
+ break;
+ }
+ }
+
+ // If history or contact: double click action places a new call
+ else
+ {
+ DEBUG("active tree is history or contact");
- // Create a new call
- create_new_call (CALL, CALL_STATE_DIALING, "", account_id, selectedCall->_peer_name, selectedCall->_peer_number, &new_call);
+ account_id = g_strdup (selectedCall->_accountID);
+
+ // Create a new call
+ create_new_call (CALL, CALL_STATE_DIALING, "", account_id, selectedCall->_peer_name, selectedCall->_peer_number, &new_call);
- calllist_add(current_calls, new_call);
- calltree_add_call(current_calls, new_call, NULL);
- sflphone_place_call(new_call);
- calltree_display(current_calls);
- }
+ calllist_add(current_calls, new_call);
+ calltree_add_call(current_calls, new_call, NULL);
+ sflphone_place_call(new_call);
+ calltree_display(current_calls);
}
+ }
}
else if(calltab_get_selected_type(current_calls) == A_CONFERENCE)
{
@@ -232,7 +230,7 @@ row_activated(GtkTreeView *tree_view UNUSED,
switch(selectedConf->_state)
{
case CONFERENCE_STATE_ACTIVE_ATACHED:
- sflphone_add_main_participant(selectedConf);
+ // sflphone_add_main_participant(selectedConf);
break;
case CONFERENCE_STATE_ACTIVE_DETACHED:
sflphone_add_main_participant(selectedConf);
@@ -283,7 +281,7 @@ row_single_click(GtkTreeView *tree_view UNUSED, void * data UNUSED)
// sflphone_selected_call_codec(selectedCall);
// DEBUG("single click action: %s", dbus_get_current_codec_name(selectedCall));
- sflphone_display_selected_codec(dbus_get_current_codec_name(selectedCall));
+ // sflphone_display_selected_codec(dbus_get_current_codec_name(selectedCall));
switch(selectedCall->_srtp_state)
{
@@ -526,6 +524,7 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
gchar* srtp_enabled = "";
gboolean display_sas = TRUE;
account_t* account_details=NULL;
+ gchar *audio_codec = "";
int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), parent);
@@ -573,6 +572,7 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
gchar * description;
gchar * date="";
gchar * duration="";
+ audio_codec = call_get_audio_codec (c);
if(c->_state == CALL_STATE_TRANSFERT)
{
@@ -592,15 +592,17 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
} else {
DEBUG("Updating state code %d %s", c->_state_code, c->_state_code_description);
if (c->_state_code) {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i>",
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s (%d)</i> <i>%s</i>",
c->_peer_number,
c->_peer_name,
c->_state_code_description,
- c->_state_code);
+ c->_state_code,
+ audio_codec);
} else {
- description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>",
+ description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>\n<i>%s</i>",
c->_peer_number,
- c->_peer_name );
+ c->_peer_name,
+ audio_codec);
}
}
}
@@ -689,7 +691,7 @@ calltree_update_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
void calltree_add_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
{
- DEBUG("calltree_add_call %s", c->_callID);
+ DEBUG("calltree_add_call id: %s, peer name: %s", c->_callID, c->_peer_name);
if (tab == history)
{
@@ -893,196 +895,215 @@ void calltree_add_history_entry (callable_obj_t * c)
void calltree_add_conference (calltab_t* tab, conference_obj_t* conf)
{
- DEBUG("calltree_add_conference conf->_confID %s\n", conf->_confID);
-
- GdkPixbuf *pixbuf=NULL;
- GdkPixbuf *pixbuf_security=NULL;
- GtkTreeIter iter;
- GtkTreePath *path;
- GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
-
- gchar** participant = conf->participant;
- gchar** pl;
- gchar* call_id;
-
- callable_obj_t * call;
-
- account_t* account_details=NULL;
- gchar* srtp_enabled="";
-
- // New call in the list
-
- gchar * description;
- // description = g_markup_printf_escaped("<b>%s</b>", conf->_confID);
- description = g_markup_printf_escaped("<b>%s</b>", "");
-
- gtk_tree_store_append (tab->store, &iter, NULL);
-
- if( tab == current_calls )
- {
-
- DEBUG("------------- calltree_add_conference %s, %s ------------------------", tab, current_calls);
- switch(conf->_state)
- {
- case CONFERENCE_STATE_ACTIVE_ATACHED:
- {
-
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/usersActive.svg", NULL);
- break;
- }
- case CONFERENCE_STATE_ACTIVE_DETACHED:
- case CONFERENCE_STATE_HOLD:
- {
-
-
- pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/users.svg", NULL);
- break;
- }
- default:
- WARN("Update conference add - Should not happen!");
- }
+ DEBUG("calltree_add_conference conf->_confID %s\n", conf->_confID);
+ GdkPixbuf *pixbuf=NULL;
+ GdkPixbuf *pixbuf_security=NULL;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GtkTreeModel *model = (GtkTreeModel*)active_calltree->store;
+ // gchar** participant = dbus_get_participant_list(conf->_confID);
+ // gchar** pl;
+ GSList* conference_participant;
+ gchar* call_id;
- //Resize it
- if(pixbuf)
- {
- if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32)
- {
- pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
- }
- }
- else
- {
- DEBUG("Error no pixbuff for conference from %s", ICONS_DIR);
- }
+ callable_obj_t * call;
+ account_t* account_details=NULL;
+ gchar* srtp_enabled="";
- // Used to determine if at least one participant use a security feature
- // If true (at least on call use a security feature) we need to display security icons
- conf->_conf_srtp_enabled = FALSE;
+ // New call in the list
+
+ gchar * description;
- // Used to determine if the conference is secured
- // Every participant to a conference must be secured, the conference is not secured elsewhere
- conf->_conference_secured = TRUE;
- DEBUG("Determine if conference is secured");
-
- participant = conf->participant;
- if(participant)
- {
- DEBUG(" determine if at least one participant uses srtp");
+ if(!conf) {
+ DEBUG("Error conference is null!!");
+ return;
+ }
- participant = conf->participant;
- for (pl = participant; *participant; participant++)
- {
- call_id = (gchar*)(*participant);
- call = calllist_get (tab, call_id);
-
- if(call != NULL) {
-
- account_details = account_list_get_by_id(call->_callID);
- if(account_details != NULL) {
- srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
- }
+ // description = g_markup_printf_escaped("<b>%s</b>", conf->_confID);
+ description = g_markup_printf_escaped("<b>%s</b>", "");
- if(g_strcasecmp(srtp_enabled,"true") == 0) {
- DEBUG(" srtp enabled for participant %s\n", participant);
- conf->_conf_srtp_enabled = TRUE;
- break;
- } else {
- DEBUG(" srtp is not enabled for participant %s\n", participant);
- }
+ gtk_tree_store_append (tab->store, &iter, NULL);
- }
+ // _debug
- }
+ if( tab == current_calls )
+ {
- DEBUG(" determine if all conference participant are secured");
+ if(!(conf->_state))
+ DEBUG("Error conf->_state is NULL");
- if(conf->_conf_srtp_enabled)
- {
- participant = conf->participant;
- for (pl = participant; *participant; participant++)
- {
- call_id = (gchar*)(*participant);
- call = calllist_get (tab, call_id);
+ switch(conf->_state)
+ {
+ case CONFERENCE_STATE_ACTIVE_ATACHED:
+ {
+
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/usersActive.svg", NULL);
+ break;
+ }
+ case CONFERENCE_STATE_ACTIVE_DETACHED:
+ case CONFERENCE_STATE_HOLD:
+ {
+
+
+ pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/users.svg", NULL);
+ break;
+ }
+ default:
+ WARN("Update conference add - Should not happen!");
+ }
+ }
+ else
+ {
+ DEBUG("Error Conference State NULL for conferece %s!!!!!", conf->_confID);
+ }
- if(call != NULL) {
- if(call->_srtp_state == 0)
- {
- DEBUG(" participant %s is not secured", participant);
+ //Resize it
+ if(pixbuf) {
+ if(gdk_pixbuf_get_width(pixbuf) > 32 || gdk_pixbuf_get_height(pixbuf) > 32) {
+ pixbuf = gdk_pixbuf_scale_simple(pixbuf, 32, 32, GDK_INTERP_BILINEAR);
+ }
+ }
+ else {
+ DEBUG("Error no pixbuff for conference from %s", ICONS_DIR);
+ }
+
+ // Used to determine if at least one participant use a security feature
+ // If true (at least on call use a security feature) we need to display security icons
+ conf->_conf_srtp_enabled = FALSE;
+
+ // Used to determine if the conference is secured
+ // Every participant to a conference must be secured, the conference is not secured elsewhere
+ conf->_conference_secured = TRUE;
+
+ DEBUG("Determine if conference is secured");
+
+ // participant = conf->participant;
+ // participant = dbus_get_participant_list(conf->_confID);
+ conference_participant = conf->participant_list;
+ if(conference_participant) {
+
+ DEBUG(" determine if at least one participant uses srtp");
+
+ // participant = conf->participant;
+ // participant = dbus_get_participant_list(conf->_confID);
+ // for (pl = participant; *pl; pl++)
+ while(conference_participant) {
+
+ // call_id = (gchar*)(*pl);
+ call_id = (gchar*)(conference_participant->data);
+ call = calllist_get (tab, call_id);
+
+ if(call != NULL) {
+
+ account_details = account_list_get_by_id(call->_callID);
+ if(account_details != NULL) {
+ srtp_enabled = g_hash_table_lookup(account_details->properties, ACCOUNT_SRTP_ENABLED);
+ }
+
+ if(g_strcasecmp(srtp_enabled,"true") == 0) {
+ DEBUG(" srtp enabled for participant %s\n", call_id);
+ conf->_conf_srtp_enabled = TRUE;
+ break;
+ }
+ else {
+ DEBUG(" srtp is not enabled for participant %s\n", call_id);
+ }
+
+ }
+
+ conference_participant = conference_next_participant(conference_participant);
+
+ }
+
+ DEBUG(" determine if all conference participant are secured");
+
+ if(conf->_conf_srtp_enabled) {
+ // participant = conf->participant;
+ conference_participant = conf->participant_list;
+ // for (pl = participant; *pl; pl++)
+ while(conference_participant) {
+ // call_id = (gchar*)(*pl);
+ call_id = (gchar*)(conference_participant->data);
+ call = calllist_get (tab, call_id);
+
+ if(call != NULL) {
+
+ if(call->_srtp_state == 0) {
+ DEBUG(" participant %s is not secured", call_id);
conf->_conference_secured = FALSE;
break;
- } else {
- DEBUG(" participant %s is secured", participant);
- }
- }
- }
- }
- }
-
- if(conf->_conf_srtp_enabled)
- {
- if(conf->_conference_secured)
- {
- DEBUG("Conference is secured");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
- }
- else
- {
- DEBUG("Conference is not secured");
- pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
- }
- }
-
- DEBUG("add conference to tree store");
-
- gtk_tree_store_set(tab->store, &iter,
- 0, pixbuf, // Icon
- 1, description, // Description
- 2, pixbuf_security,
- 3, conf, // Pointer
- -1);
-
- DEBUG("add conference to tree store");
-
-
- if (pixbuf != NULL)
- g_object_unref(G_OBJECT(pixbuf));
-
-
- participant = conf->participant;
- if(participant)
- {
- for (pl = participant; *participant; participant++)
- {
-
-
- call_id = (gchar*)(*participant);
- call = calllist_get (tab, call_id);
- // create_new_call_from_details (conf_id, conference_details, &c);
-
- calltree_remove_call(tab, call, NULL);
- calltree_add_call (tab, call, &iter);
- }
+ }
+ else {
+ DEBUG(" participant %s is secured", call_id);
+ }
}
-
+ conference_participant = conference_next_participant(conference_participant);
+ }
}
+ }
- else
- {
- WARN ("Conferences cannot be added in this widget - This is a bug in the application.");
+ if(conf->_conf_srtp_enabled) {
+ if(conf->_conference_secured) {
+ DEBUG("Conference is secured");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
+ }
+ else {
+ DEBUG("Conference is not secured");
+ pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
}
+ }
+
+ DEBUG("add conference to tree store");
+
+ gtk_tree_store_set(tab->store, &iter,
+ 0, pixbuf, // Icon
+ 1, description, // Description
+ 2, pixbuf_security,
+ 3, conf, // Pointer
+ -1);
+
+ if (pixbuf != NULL)
+ g_object_unref(G_OBJECT(pixbuf));
+
+ // participant = conf->participant;
+ // participant = dbus_get_participant_list(conf->_confID);
+ conference_participant = conf->participant_list;
+ if(conference_participant) {
+
+ DEBUG("Add conference participants\n");
+ // for (pl = participant; *pl; pl++)
+ while(conference_participant) {
+
+
+ call_id = (gchar*)(conference_participant->data);
+ call = calllist_get (tab, call_id);
+ // create_new_call_from_details (conf_id, conference_details, &c);
+
+ calltree_remove_call(tab, call, NULL);
+ calltree_add_call (tab, call, &iter);
+
+ conference_participant = conference_next_participant(conference_participant);
+ }
+ }
+ /*
+ else
+ {
+ WARN ("Conferences cannot be added in this widget - This is a bug in the application.");
+ }
+ */
- gtk_tree_view_set_model(GTK_TREE_VIEW(tab->view), GTK_TREE_MODEL(tab->store));
+gtk_tree_view_set_model(GTK_TREE_VIEW(tab->view), GTK_TREE_MODEL(tab->store));
- path = gtk_tree_model_get_path(model, &iter);
+path = gtk_tree_model_get_path(model, &iter);
gtk_tree_view_expand_row(GTK_TREE_VIEW(tab->view), path, FALSE);
- update_actions();
+update_actions();
}
diff --git a/sflphone-client-gnome/src/contacts/history.c b/sflphone-client-gnome/src/contacts/history.c
index 6d18b39471b02f8510022d7206dc9df6a88b1ade..5aa5010d2ad86f410cd11246d3f6f59c93db83f4 100644
--- a/sflphone-client-gnome/src/contacts/history.c
+++ b/sflphone-client-gnome/src/contacts/history.c
@@ -69,7 +69,9 @@ static gboolean history_is_visible (GtkTreeModel* model, GtkTreeIter* iter, gpoi
callable_obj_t *history_entry = NULL;
gchar* text = NULL;
+
gchar* search = (gchar*)gtk_entry_get_text(GTK_ENTRY(history_searchbar_widget));
+
memset (&val, 0, sizeof(val));
memset (&obj, 0, sizeof(obj));
@@ -80,7 +82,7 @@ static gboolean history_is_visible (GtkTreeModel* model, GtkTreeIter* iter, gpoi
}
// Fetch the call type
- gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 2, &obj);
+ gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 3, &obj);
if (G_VALUE_HOLDS_POINTER (&obj)){
history_entry = (gpointer) g_value_get_pointer (&obj);
}
diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
index be81e7a9a7e186379ffcc31ce147426198d4ddab..7f5eac2ad6bf9104978f3ca794f002dc35d1f5c5 100644
--- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml
@@ -288,13 +288,6 @@
<method name="switchPopupMode">
</method>
- <method name="setPulseAppVolumeControl">
- </method>
-
- <method name="getPulseAppVolumeControl">
- <arg type="s" name="state" direction="out"/>
- </method>
-
<method name="setSipPort">
<arg type="i" name="port" direction="in"/>
</method>
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 57fb577203109fec4bba8bdf7e3bb1442e8426cf..ed2e4b140d04b6537f97490ecd280f88b4410e4d 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -94,8 +94,8 @@ curent_selected_codec (DBusGProxy *proxy UNUSED,
const gchar* codecName,
void * foo UNUSED )
{
- DEBUG ("%s codec decided for call %s",codecName,callID);
- sflphone_display_selected_codec (codecName);
+ // DEBUG ("%s codec decided for call %s",codecName,callID);
+ // sflphone_display_selected_codec (codecName);
}
static void
@@ -233,28 +233,37 @@ conference_changed_cb (DBusGProxy *proxy UNUSED,
DEBUG ("-------------------- Conference changed ---------------------\n");
// sflphone_display_transfer_status("Transfer successfull");
conference_obj_t* changed_conf = conferencelist_get(confID);
+ gchar** participants;
+ gchar** part;
- DEBUG(" %s\n", state);
+ DEBUG("conference new state %s\n", state);
if(changed_conf)
{
+ // remove old conference from calltree
calltree_remove_conference (current_calls, changed_conf, NULL);
- if ( strcmp(state, "ACTIVE_ATACHED") == 0 )
- {
+ // update conference state
+ if ( strcmp(state, "ACTIVE_ATACHED") == 0 ) {
changed_conf->_state = CONFERENCE_STATE_ACTIVE_ATACHED;
}
- else if ( strcmp(state, "ACTIVE_DETACHED") == 0 )
- {
+ else if ( strcmp(state, "ACTIVE_DETACHED") == 0 ) {
changed_conf->_state = CONFERENCE_STATE_ACTIVE_DETACHED;
}
- else if ( strcmp(state, "HOLD") == 0 )
- {
+ else if ( strcmp(state, "HOLD") == 0 ) {
changed_conf->_state = CONFERENCE_STATE_HOLD;
}
+ else {
+ DEBUG("Error: conference state not recognized");
+ }
+
- changed_conf->participant = (gchar**)dbus_get_participant_list(changed_conf->_confID);
+ participants = (gchar**)dbus_get_participant_list(changed_conf->_confID);
+ // update conferece participants
+ conference_participant_list_update(participants, changed_conf);
+
+ // add new conference to calltree
calltree_add_conference (current_calls, changed_conf);
}
}
@@ -270,22 +279,25 @@ conference_created_cb (DBusGProxy *proxy UNUSED,
conference_obj_t* new_conf;
callable_obj_t* call;
gchar* call_id;
- gchar** participant;
- gchar** pl;
+ gchar** participants;
+ gchar** part;
create_new_conference(CONFERENCE_STATE_ACTIVE_ATACHED, confID, &new_conf);
- new_conf->_confID = g_strdup(confID);
- new_conf->participant = (gchar**)dbus_get_participant_list(new_conf->_confID);
- conferencelist_add(new_conf);
+ // new_conf->_confID = g_strdup(confID);
+
+ participants = (gchar**)dbus_get_participant_list(new_conf->_confID);
+
+ conference_participant_list_update(participants, new_conf);
- participant = new_conf->participant;
- for (pl = participant; *participant; participant++)
+ // participant = new_conf->participant;
+ for (part = participants; *part; part++)
{
- call_id = (gchar*)(*participant);
+ call_id = (gchar*)(*part);
call = calllist_get (current_calls, call_id);
call->_confID = g_strdup(confID);
}
+ conferencelist_add(new_conf);
calltree_add_conference (current_calls, new_conf);
}
@@ -1219,13 +1231,10 @@ dbus_codec_details( int payload )
return array;
}
- gchar*
-dbus_get_current_codec_name(const callable_obj_t * c)
+gchar* dbus_get_current_codec_name (const callable_obj_t * c)
{
- DEBUG("dbus_get_current_codec_name : CallID : %s", c->_callID);
-
- gchar* codecName;
+ gchar* codecName= "";
GError* error = NULL;
org_sflphone_SFLphone_CallManager_get_current_codec_name (
@@ -2013,38 +2022,6 @@ dbus_get_notify( void )
}
}
-
- void
-dbus_set_mail_notify( void )
-{
- GError* error = NULL;
- org_sflphone_SFLphone_ConfigurationManager_set_mail_notify(
- configurationManagerProxy,
- &error);
- if(error)
- {
- g_error_free(error);
- }
-}
-
- guint
-dbus_get_mail_notify( void )
-{
- gint level;
- GError* error = NULL;
- org_sflphone_SFLphone_ConfigurationManager_get_mail_notify(
- configurationManagerProxy,
- &level,
- &error);
- if(error)
- {
- ERROR("Error calling dbus_get_mail_notif_level");
- g_error_free(error);
- }
-
- return (guint)level;
-}
-
void
dbus_set_audio_manager( int api )
{
@@ -2077,31 +2054,6 @@ dbus_get_audio_manager( void )
return api;
}
- void
-dbus_set_pulse_app_volume_control( void )
-{
- GError* error = NULL;
- org_sflphone_SFLphone_ConfigurationManager_set_pulse_app_volume_control(
- configurationManagerProxy,
- &error);
- if(error)
- {
- g_error_free(error);
- }
-}
-
- gchar*
-dbus_get_pulse_app_volume_control( void )
-{
- gchar* state;
- GError* error = NULL;
- org_sflphone_SFLphone_ConfigurationManager_get_pulse_app_volume_control(
- configurationManagerProxy,
- &state,
- &error);
- return state;
-}
-
void
dbus_set_sip_port( const guint portNum )
{
@@ -2261,6 +2213,8 @@ gchar** dbus_get_participant_list (const char * confID)
GError *error = NULL;
gchar **list = NULL;
+ DEBUG("get participant list")
+
org_sflphone_SFLphone_CallManager_get_participant_list (callManagerProxy, confID, &list, &error);
if (error){
ERROR ("Error calling org_sflphone_SFLphone_CallManager_get_participant_list");
diff --git a/sflphone-client-gnome/src/dbus/dbus.h b/sflphone-client-gnome/src/dbus/dbus.h
index 9bb9755e6a5d7293b97813fbccf7b4b806ca24d9..12ef975ff443ca893c1a2e6809421c0b1638061d 100644
--- a/sflphone-client-gnome/src/dbus/dbus.h
+++ b/sflphone-client-gnome/src/dbus/dbus.h
@@ -348,17 +348,6 @@ int dbus_is_ringtone_enabled( void );
*/
void dbus_ringtone_enabled( void );
-/**
- * ConfigurationManager - Set PA behaviour for the other sound streams
- * Inverse current value
- */
-void dbus_set_pulse_app_volume_control( void );
-
-/**
- * ConfigurationManager - Get PA behaviour for the other sound streams
- */
-gchar* dbus_get_pulse_app_volume_control( void );
-
/**
* ConfigurationManager - Get the ringtone
* @return gchar* The file name selected as a ringtone
@@ -475,18 +464,6 @@ guint dbus_get_notify( void );
*/
void dbus_set_notify( void );
-/**
- * ConfigurationManager - Configure the mail notification level
- * @return int 0 disable
- * 1 enable
- */
-guint dbus_get_mail_notify( void );
-
-/**
- * ConfigurationManager - Configure the mail notification level
- */
-void dbus_set_mail_notify( void );
-
/**
* ConfigurationManager - Start a tone when a new call is open and no numbers have been dialed
* @param start 1 to start
@@ -556,6 +533,10 @@ GHashTable* dbus_get_call_details (const gchar* callID);
gchar** dbus_get_call_list (void);
+GHashTable* dbus_get_conference_details (const gchar* confID);
+
+gchar** dbus_get_conference_list (void);
+
void dbus_set_accounts_order (const gchar* order);
GHashTable* dbus_get_history (void);
diff --git a/sflphone-client-gnome/src/main.c b/sflphone-client-gnome/src/main.c
index ad6058561af6fa37b8ec456b37cb43359bc3cc1b..f7a8cecd8e219e25fa532817aab25ce1c02de275 100644
--- a/sflphone-client-gnome/src/main.c
+++ b/sflphone-client-gnome/src/main.c
@@ -113,8 +113,9 @@ There is NO WARRANTY, to the extent permitted by law.\n\n");
// Load the history
sflphone_fill_history ();
- // Get the active calls at startup
+ // Get the active calls and conferences at startup
sflphone_fill_call_list ();
+ sflphone_fill_conference_list();
/* start the main loop */
gtk_main();
diff --git a/sflphone-client-gnome/src/ui.xml b/sflphone-client-gnome/src/ui.xml
index 23469a1e7d056de949580b3097f632d749398baf..6d3fe1f77ca80a1e3983b439a07352460b83345e 100644
--- a/sflphone-client-gnome/src/ui.xml
+++ b/sflphone-client-gnome/src/ui.xml
@@ -56,4 +56,10 @@
<toolitem name="HistoryToolbar" action="History"/>
<toolitem name="AddressbookToolbar" action="Addressbook"/>
</toolbar>
+
+ <popup name="PopupMenu">
+ <menuitem action="Copy"/>
+ <menuitem action="Paste"/>
+ <separator/>
+ </popup>
</ui>
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index f7542452a0774b858487c54d5c766a2b2456d00f..4e782bb4d5ca67dce2db6446a616aeb85e351e39 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -165,8 +165,6 @@ void update_actions()
gtk_widget_set_sensitive (GTK_WIDGET (offHoldToolbar), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (newCallWidget), TRUE);
// Replace the hold button with the off-hold button
- //g_object_ref (holdToolbar);
- gtk_container_remove (GTK_CONTAINER (toolbar), GTK_WIDGET(holdToolbar));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (hangUpWidget), 1);
gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM (offHoldToolbar), 2);
break;
@@ -223,47 +221,25 @@ void update_actions()
}
}
- else if(selectedConf)
- {
- /*
- switch(selectedConf->_state)
- {
- case CONFERENCE_STATE_ACTIVE_ATACHED:
- gtk_action_set_sensitive( GTK_ACTION(recordAction), FALSE);
- break;
- case CONFERENCE_STATE_ACTIVE_DETACHED:
- gtk_action_set_sensitive( GTK_ACTION(recordAction), FALSE);
- break;
- case CONFERENCE_STATE_RECORD:
- gtk_action_set_sensitive( GTK_ACTION(recordAction), FALSE);
- break;
- case CONFERENCE_STATE_HOLD:
- gtk_action_set_sensitive( GTK_ACTION(recordAction), FALSE);
- break;
- default:
- break;
- }
- */
- }
-
else
{
- if( account_list_get_size() > 0 )
- {
- //gtk_widget_set_sensitive (GTK_WIDGET(callButton), TRUE);
- if (account_list_current_account_has_mailbox ())
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (voicemailToolbar), -2);
- }
- else
+ if( account_list_get_size() > 0 && current_account_has_mailbox ())
{
- // gtk_widget_set_sensitive (GTK_WIDGET(callButton), FALSE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (voicemailToolbar), -2);
+ update_voicemail_status ();
}
-
- // gtk_action_set_sensitive( GTK_ACTION(newCallMenu), TRUE);
}
- // gtk_signal_handler_unblock (holdToolbar, holdConnId);
- // gtk_signal_handler_unblock (offHoldToolbar, holdConnId);
+}
+void update_voicemail_status (void)
+{
+ gchar *messages = "";
+ messages = g_markup_printf_escaped (_("Voicemail (%i)"), current_account_get_message_number ());
+ (current_account_has_new_message ()) ?
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (voicemailToolbar), "mail-message-new"):
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (voicemailToolbar), "mail-read");
+ gtk_tool_button_set_label (GTK_TOOL_BUTTON (voicemailToolbar), messages);
+ g_free (messages);
}
static void volume_bar_cb (GtkToggleAction *togglemenuitem, gpointer user_data)
@@ -297,18 +273,18 @@ static void help_contents_cb (GtkAction *action)
static void help_about ( void * foo UNUSED)
{
gchar *authors[] = {
+ "Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>",
+ "Jean-Philippe Barrette-LaPierre",
+ "Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>",
+ "Julien Bonjean <julien.bonjean@savoirfairelinux.com>",
+ "Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>",
+ "Laurielle Lea",
+ "Yun Liu <yun.liu@savoirfairelinux.com>",
+ "Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>",
"Yan Morin <yan.morin@savoirfairelinux.com>",
"Jérôme Oufella <jerome.oufella@savoirfairelinux.com>",
"Julien Plissonneau Duquene <julien.plissonneau.duquene@savoirfairelinux.com>",
- "Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>",
- "Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>",
- "Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>",
- "Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>",
- "Yun Liu <yun.liu@savoirfairelinux.com>",
"Alexandre Savard <alexandre.savard@savoirfairelinux.com>",
- "Jean-Philippe Barrette-LaPierre",
- "Laurielle Lea",
- "Pierre-Luc Bacon <pierre-luc.bacon@savoifairelinux.com>",
NULL};
gchar *artists[] = {
"Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>",
@@ -624,29 +600,6 @@ static void clear_history (void)
}
}
-/*
-static void calltree_switch_cb (GtkRadioAction *action, GtkRadioAction *current)
-{
- gint value = gtk_radio_action_get_current_value (current);
- switch (value)
- {
- case CALLTREE_CALLS:
- calltree_display (current_calls);
- break;
- case CALLTREE_HISTORY:
- calltree_display (history);
- break;
- case CALLTREE_CONTACTS:
- calltree_display (contacts);
- break;
- default:
- calltree_display (current_calls);
- break;
- }
-}
-*/
-
-
/**
* Transfert the line
*/
@@ -703,7 +656,7 @@ static const GtkActionEntry menu_entries[] = {
{ "OffHold", GTK_STOCK_OFFHOLD, "O_ff hold", "<control>P", "Place the call off hold", G_CALLBACK (call_hold) },
{ "Record", GTK_STOCK_MEDIA_RECORD, "_Record", "<control>R", "Record the current conversation", G_CALLBACK (call_record) },
{ "AccountAssistant", NULL, "Configuration _Assistant", NULL, "Run the configuration assistant", G_CALLBACK (call_configuration_assistant) },
- { "Voicemail", "mail-message-new", "Voicemail", NULL, "Call your voicemail", G_CALLBACK (call_mailbox_cb) },
+ { "Voicemail", "mail-read", "Voicemail", NULL, "Call your voicemail", G_CALLBACK (call_mailbox_cb) },
{ "Close", GTK_STOCK_CLOSE, "_Close", "<control>W", "Minimize to system tray", G_CALLBACK (call_minimize) },
{ "Quit", GTK_STOCK_CLOSE, "_Quit", "<control>Q", "Quit the program", G_CALLBACK (call_quit) },
@@ -1069,6 +1022,7 @@ show_popup_menu_history(GtkWidget *my_widget, GdkEventButton *event)
gboolean pickup = FALSE;
gboolean remove = FALSE;
gboolean edit = FALSE;
+ gboolean accounts = FALSE;
callable_obj_t * selectedCall = calltab_get_selected_call( history );
if (selectedCall)
@@ -1076,6 +1030,7 @@ show_popup_menu_history(GtkWidget *my_widget, GdkEventButton *event)
remove = TRUE;
pickup = TRUE;
edit = TRUE;
+ accounts = TRUE;
}
GtkWidget *menu;
@@ -1119,6 +1074,11 @@ show_popup_menu_history(GtkWidget *my_widget, GdkEventButton *event)
gtk_widget_show (menu_items);
}
+ if(accounts)
+ {
+ add_registered_accounts_to_menu (menu);
+ }
+
if (event)
{
button = event->button;
diff --git a/sflphone-client-gnome/src/uimanager.h b/sflphone-client-gnome/src/uimanager.h
index c34d5afd503c8f5fbf66f895902fb02bcc33f36c..c42bf1aa04d769bfb34ff2eeceb846231fada3a7 100644
--- a/sflphone-client-gnome/src/uimanager.h
+++ b/sflphone-client-gnome/src/uimanager.h
@@ -35,6 +35,8 @@ gboolean uimanager_new (GtkUIManager**);
static void show_edit_number ();
+void update_voicemail_status (void);
+
G_END_DECLS
#endif
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 2b146685ee07a335934301ebf65c30b0ddcf237e..8ea46baa20c58530f23655ea5e79219ee206178f 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
- AC_INIT([SFLphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
+ AC_INIT([sflphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$])
diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak
index 408d9a68e0d9a418f20af4bc6b8b24bf00bc5742..b1bc9a5c11b88bb2d152e862d90c89dba4e5a6d8 100644
--- a/sflphone-common/globals.mak
+++ b/sflphone-common/globals.mak
@@ -1,7 +1,8 @@
# Global variables
src=$(top_srcdir)
-sflcodecdir=$(DESTDIR)$(libdir)/sflphone/codecs
-sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins
+sfllibdir=$(DESTDIR)$(libdir)/sflphone
+sflcodecdir=$(sfllibdir)/codecs
+sflplugindir=$(sfllibdir)/plugins
ASTYLERC="../astylerc"
indent="/usr/bin/astyle"
diff --git a/sflphone-common/libs/dbus-c++/src/Makefile.am b/sflphone-common/libs/dbus-c++/src/Makefile.am
index 09d7bd659f7c9f460d95dcc9847272f0061008fb..7bc99b89ca23aaf875c4406ff6445738cea1fc8b 100644
--- a/sflphone-common/libs/dbus-c++/src/Makefile.am
+++ b/sflphone-common/libs/dbus-c++/src/Makefile.am
@@ -37,9 +37,10 @@ HEADER_FILES = \
# noinst_lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
noinst_HEADERS = $(HEADER_FILES)
-lib_LTLIBRARIES = libdbus-c++-1.la
+pkglib_LTLIBRARIES = libdbus-c++-1.la
libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp $(GLIB_CPP) $(ECORE_CPP)
libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS)
MAINTAINERCLEANFILES = \
Makefile.in
+
diff --git a/sflphone-common/libs/pjproject/aconfigure b/sflphone-common/libs/pjproject/aconfigure
index fffca6bc166f473547b371bfd1eec10343a70e40..67e64d34bf2202ff74f386fc56484c071051ccf2 100755
--- a/sflphone-common/libs/pjproject/aconfigure
+++ b/sflphone-common/libs/pjproject/aconfigure
@@ -1,60 +1,81 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pjproject 1.0.
+# Generated by GNU Autoconf 2.64 for pjproject 1.0.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -63,20 +84,18 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -87,354 +106,321 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
}
+as_unset=as_fn_unset
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-if as_func_ret_success; then
- :
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
+ as_expr=false
fi
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+ as_basename=false
fi
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell autoconf@gnu.org about your system,
- echo including any error possibly output before this
- echo message
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -451,8 +437,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -462,49 +447,40 @@ test \$exitcode = 0") || {
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -512,7 +488,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -529,12 +505,12 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
- case $1 in
- -*)set "./$1";;
+ case $1 in #(
+ -*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -548,7 +524,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
exec 7<&0 </dev/null 6>&1
# Name of the host.
@@ -567,7 +542,6 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='pjproject'
@@ -575,6 +549,7 @@ PACKAGE_TARNAME='pjproject'
PACKAGE_VERSION='1.0'
PACKAGE_STRING='pjproject 1.0'
PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
# Factoring default headers for most tests.
ac_includes_default="\
@@ -612,96 +587,119 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CXX
-CXXFLAGS
-ac_ct_CXX
-ac_pjdir
-ac_build_mak_vars
-CPP
-GREP
-EGREP
-ac_os_objs
-ac_pjmedia_snd
-ac_pa_cflags
-ac_pa_use_alsa
-ac_pa_use_oss
-ac_no_small_filter
-ac_no_large_filter
-ac_no_speex_aec
-ac_no_g711_codec
-ac_no_l16_codec
-ac_no_gsm_codec
-ac_no_g722_codec
-ac_no_g7221_codec
-ac_no_speex_codec
-ac_no_ilbc_codec
-ac_no_ssl
-openssl_h_present
-libssl_present
-libcrypto_present
-ac_cross_compile
-ac_linux_poll
-ac_host
-ac_main_obj
+ac_subst_vars='LTLIBOBJS
LIBOBJS
-LTLIBOBJS'
+ac_main_obj
+ac_host
+ac_linux_poll
+ac_cross_compile
+libcrypto_present
+libssl_present
+openssl_h_present
+ac_no_ssl
+ac_no_ilbc_codec
+ac_no_speex_codec
+ac_no_g7221_codec
+ac_no_g722_codec
+ac_no_gsm_codec
+ac_no_l16_codec
+ac_no_g711_codec
+ac_no_speex_aec
+ac_no_large_filter
+ac_no_small_filter
+ac_pa_use_oss
+ac_pa_use_alsa
+ac_pa_cflags
+ac_pjmedia_snd
+ac_os_objs
+EGREP
+GREP
+CPP
+ac_build_mak_vars
+ac_pjdir
+ac_ct_CXX
+CXXFLAGS
+CXX
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_floating_point
+enable_epoll
+enable_sound
+enable_oss
+enable_ext_sound
+enable_small_filter
+enable_large_filter
+enable_speex_aec
+enable_g711_codec
+enable_l16_codec
+enable_gsm_codec
+enable_g722_codec
+enable_g7221_codec
+enable_speex_codec
+enable_ilbc_codec
+enable_libsamplerate
+enable_ipp
+enable_ipp_samples
+enable_ssl
+'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -719,6 +717,8 @@ CPP'
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -817,13 +817,20 @@ do
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -836,13 +843,20 @@ do
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1033,22 +1047,36 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -1068,25 +1096,25 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1095,23 +1123,36 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
fi
-# Be sure to have absolute directory names.
+# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1125,7 +1166,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1141,23 +1182,21 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1184,13 +1223,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1238,9 +1275,9 @@ Configuration:
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1250,25 +1287,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/pjproject]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/pjproject]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1287,6 +1324,7 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-floating-point
@@ -1332,6 +1370,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to the package provider.
_ACEOF
ac_status=$?
fi
@@ -1339,15 +1378,17 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1383,7 +1424,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1393,58 +1434,380 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pjproject configure 1.0
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.64
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by pjproject $as_me 1.0, which was
-generated by GNU Autoconf 2.61. Invocation command line was
- $ $0 $@
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
-_ACEOF
-exec 5>>config.log
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+} # ac_fn_c_try_compile
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-_ASUNAME
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by pjproject $as_me 1.0, which was
+generated by GNU Autoconf 2.64. Invocation command line was
+
+ $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1478,12 +1841,12 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1499,13 +1862,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1530,12 +1893,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1564,9 +1928,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1581,9 +1945,9 @@ _ASBOX
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1599,64 +1963,69 @@ _ASBOX
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1666,16 +2035,16 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1689,68 +2058,56 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -1764,24 +2121,16 @@ host_orig="$host"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -1795,35 +2144,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -1839,28 +2180,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -1876,28 +2213,24 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if test "${ac_cv_target+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -1941,10 +2274,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1954,25 +2287,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -1981,10 +2314,10 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1994,25 +2327,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2020,12 +2353,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2038,10 +2367,10 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2051,25 +2380,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2078,10 +2407,10 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2092,18 +2421,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -2122,11 +2451,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2137,10 +2466,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2150,25 +2479,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2181,10 +2510,10 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2194,25 +2523,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2224,12 +2553,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2239,98 +2564,82 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ rm -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+#include <stdio.h>
int
main ()
{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort. b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions. Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -2340,14 +2649,14 @@ for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -2366,78 +2675,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
fi
-
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (case "(($ac_try" in
+ { { case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2445,37 +2751,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2487,51 +2787,46 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2545,54 +2840,34 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2603,34 +2878,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2641,35 +2893,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_c_werror_flag=$ac_save_c_werror_flag
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2680,42 +2909,18 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -2731,18 +2936,14 @@ else
CFLAGS=
fi
fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -2799,31 +3000,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_c89=$ac_arg
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -2834,17 +3013,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -2866,10 +3047,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2879,25 +3060,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2910,10 +3091,10 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2923,25 +3104,25 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2953,12 +3134,8 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
@@ -2968,49 +3145,36 @@ fi
fi
fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ rm -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3024,54 +3188,34 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
ac_cv_prog_cxx_g=no
CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3082,34 +3226,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CXXFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3120,35 +3241,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
CXXFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3159,42 +3257,18 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@ -3235,19 +3309,14 @@ case $target in
esac
-
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3265,39 +3334,18 @@ return pthread_create ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pthread_pthread_create=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pthread_pthread_create=no
+ ac_cv_lib_pthread_pthread_create=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREAD 1
_ACEOF
@@ -3306,19 +3354,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for puts in -lwsock32" >&5
-echo $ECHO_N "checking for puts in -lwsock32... $ECHO_C" >&6; }
-if test "${ac_cv_lib_wsock32_puts+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lwsock32" >&5
+$as_echo_n "checking for puts in -lwsock32... " >&6; }
+if test "${ac_cv_lib_wsock32_puts+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwsock32 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3336,39 +3379,18 @@ return puts ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_wsock32_puts=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_wsock32_puts=no
+ ac_cv_lib_wsock32_puts=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_wsock32_puts" >&5
-echo "${ECHO_T}$ac_cv_lib_wsock32_puts" >&6; }
-if test $ac_cv_lib_wsock32_puts = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wsock32_puts" >&5
+$as_echo "$ac_cv_lib_wsock32_puts" >&6; }
+if test "x$ac_cv_lib_wsock32_puts" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBWSOCK32 1
_ACEOF
@@ -3377,19 +3399,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for puts in -lws2_32" >&5
-echo $ECHO_N "checking for puts in -lws2_32... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ws2_32_puts+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lws2_32" >&5
+$as_echo_n "checking for puts in -lws2_32... " >&6; }
+if test "${ac_cv_lib_ws2_32_puts+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lws2_32 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3407,39 +3424,18 @@ return puts ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ws2_32_puts=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ws2_32_puts=no
+ ac_cv_lib_ws2_32_puts=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_puts" >&5
-echo "${ECHO_T}$ac_cv_lib_ws2_32_puts" >&6; }
-if test $ac_cv_lib_ws2_32_puts = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_puts" >&5
+$as_echo "$ac_cv_lib_ws2_32_puts" >&6; }
+if test "x$ac_cv_lib_ws2_32_puts" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBWS2_32 1
_ACEOF
@@ -3448,19 +3444,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for puts in -lole32" >&5
-echo $ECHO_N "checking for puts in -lole32... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ole32_puts+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lole32" >&5
+$as_echo_n "checking for puts in -lole32... " >&6; }
+if test "${ac_cv_lib_ole32_puts+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lole32 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3478,39 +3469,18 @@ return puts ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ole32_puts=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ole32_puts=no
+ ac_cv_lib_ole32_puts=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ole32_puts" >&5
-echo "${ECHO_T}$ac_cv_lib_ole32_puts" >&6; }
-if test $ac_cv_lib_ole32_puts = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ole32_puts" >&5
+$as_echo "$ac_cv_lib_ole32_puts" >&6; }
+if test "x$ac_cv_lib_ole32_puts" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBOLE32 1
_ACEOF
@@ -3519,19 +3489,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for puts in -lwinmm" >&5
-echo $ECHO_N "checking for puts in -lwinmm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_winmm_puts+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lwinmm" >&5
+$as_echo_n "checking for puts in -lwinmm... " >&6; }
+if test "${ac_cv_lib_winmm_puts+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwinmm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3549,39 +3514,18 @@ return puts ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_winmm_puts=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_winmm_puts=no
+ ac_cv_lib_winmm_puts=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_winmm_puts" >&5
-echo "${ECHO_T}$ac_cv_lib_winmm_puts" >&6; }
-if test $ac_cv_lib_winmm_puts = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_winmm_puts" >&5
+$as_echo "$ac_cv_lib_winmm_puts" >&6; }
+if test "x$ac_cv_lib_winmm_puts" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBWINMM 1
_ACEOF
@@ -3590,19 +3534,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for puts in -lsocket" >&5
-echo $ECHO_N "checking for puts in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_puts+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lsocket" >&5
+$as_echo_n "checking for puts in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_puts+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3620,39 +3559,18 @@ return puts ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_socket_puts=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_puts=no
+ ac_cv_lib_socket_puts=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_puts" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_puts" >&6; }
-if test $ac_cv_lib_socket_puts = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_puts" >&5
+$as_echo "$ac_cv_lib_socket_puts" >&6; }
+if test "x$ac_cv_lib_socket_puts" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
@@ -3661,19 +3579,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for puts in -lrt" >&5
-echo $ECHO_N "checking for puts in -lrt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_rt_puts+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lrt" >&5
+$as_echo_n "checking for puts in -lrt... " >&6; }
+if test "${ac_cv_lib_rt_puts+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lrt $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3691,39 +3604,18 @@ return puts ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_rt_puts=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_rt_puts=no
+ ac_cv_lib_rt_puts=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_puts" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_puts" >&6; }
-if test $ac_cv_lib_rt_puts = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_puts" >&5
+$as_echo "$ac_cv_lib_rt_puts" >&6; }
+if test "x$ac_cv_lib_rt_puts" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRT 1
_ACEOF
@@ -3732,19 +3624,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for puts in -lnsl" >&5
-echo $ECHO_N "checking for puts in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl_puts+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lnsl" >&5
+$as_echo_n "checking for puts in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_puts+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3762,39 +3649,18 @@ return puts ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_nsl_puts=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_nsl_puts=no
+ ac_cv_lib_nsl_puts=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_puts" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_puts" >&6; }
-if test $ac_cv_lib_nsl_puts = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_puts" >&5
+$as_echo "$ac_cv_lib_nsl_puts" >&6; }
+if test "x$ac_cv_lib_nsl_puts" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
_ACEOF
@@ -3803,19 +3669,14 @@ _ACEOF
fi
-
-{ echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
-echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6; }
-if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-luuid $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3833,39 +3694,18 @@ return uuid_generate ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_uuid_uuid_generate=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_uuid_uuid_generate=no
+ ac_cv_lib_uuid_uuid_generate=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
-echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6; }
-if test $ac_cv_lib_uuid_uuid_generate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUUID 1
_ACEOF
@@ -3874,18 +3714,14 @@ _ACEOF
fi
-{ echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
-echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6; }
-if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-luuid $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3903,68 +3739,43 @@ return uuid_generate ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_uuid_uuid_generate=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_uuid_uuid_generate=no
+ ac_cv_lib_uuid_uuid_generate=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
-echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6; }
-if test $ac_cv_lib_uuid_uuid_generate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
ac_has_uuid_lib=1
fi
-{ echo "$as_me:$LINENO: result: Setting PJ_M_NAME to $target_cpu" >&5
-echo "${ECHO_T}Setting PJ_M_NAME to $target_cpu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_M_NAME to $target_cpu" >&5
+$as_echo "Setting PJ_M_NAME to $target_cpu" >&6; }
cat >>confdefs.h <<_ACEOF
#define PJ_M_NAME "$target_cpu"
_ACEOF
-{ echo "$as_me:$LINENO: checking memory alignment" >&5
-echo $ECHO_N "checking memory alignment... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking memory alignment" >&5
+$as_echo_n "checking memory alignment... " >&6; }
case $target in
ia64-* | x86_64-* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_POOL_ALIGNMENT 8
-_ACEOF
+ $as_echo "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h
- { echo "$as_me:$LINENO: result: 8 bytes" >&5
-echo "${ECHO_T}8 bytes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 8 bytes" >&5
+$as_echo "8 bytes" >&6; }
;;
* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_POOL_ALIGNMENT 4
-_ACEOF
+ $as_echo "#define PJ_POOL_ALIGNMENT 4" >>confdefs.h
- { echo "$as_me:$LINENO: result: 4 bytes (default)" >&5
-echo "${ECHO_T}4 bytes (default)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 4 bytes (default)" >&5
+$as_echo "4 bytes (default)" >&6; }
;;
esac
@@ -3974,15 +3785,15 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${ac_cv_prog_CPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3996,11 +3807,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -4009,76 +3816,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
break
fi
@@ -4090,8 +3855,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -4101,11 +3866,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -4114,83 +3875,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+if $ac_preproc_ok; then :
+
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -4200,45 +3918,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
+ if test -z "$GREP"; then
ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
@@ -4250,77 +3963,61 @@ case `"$ac_path_GREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
+ done
done
-done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
else
ac_cv_path_GREP=$GREP
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4332,46 +4029,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
+ done
done
-done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -4386,47 +4068,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -4436,18 +4094,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -4457,14 +4111,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -4491,113 +4141,36 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -4605,280 +4178,254 @@ fi
done
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ ac_cv_c_bigendian=unknown
+ # See if we're dealing with a universal compiler.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __APPLE_CC__
+ not a universal capable compiler
+ #endif
+ typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ # Check for potential -arch flags. It is not universal unless
+ # there are at least two -arch flags with different values.
+ ac_arch=
+ ac_prev=
+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
-#include <sys/param.h>
+ #include <sys/param.h>
int
main ()
{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
- && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+ && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
# It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
-#include <sys/param.h>
+ #include <sys/param.h>
int
main ()
{
#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+ not big endian
+ #endif
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_bigendian=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <limits.h>
- # It does not; compile a test program.
-if test "$cross_compiling" = yes; then
- # try to guess the endianness by grepping values into an object file
- ac_cv_c_bigendian=unknown
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+ bogus endian macros
+ #endif
+
+ ;
+ return 0;
+}
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to _BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
int
main ()
{
- _ascii (); _ebcdic ();
+#ifndef _BIG_ENDIAN
+ not big endian
+ #endif
+
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_bigendian=yes
+else
+ ac_cv_c_bigendian=no
fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
- if test "$ac_cv_c_bigendian" = unknown; then
- ac_cv_c_bigendian=no
- else
- # finding both strings is unlikely to happen, but who knows?
- ac_cv_c_bigendian=unknown
- fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # Compile a test program.
+ if test "$cross_compiling" = yes; then :
+ # Try to guess by grepping values from an object file.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+short int ascii_mm[] =
+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ short int ascii_ii[] =
+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ int use_ascii (int i) {
+ return ascii_mm[i] + ascii_ii[i];
+ }
+ short int ebcdic_ii[] =
+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+ short int ebcdic_mm[] =
+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ int use_ebcdic (int i) {
+ return ebcdic_mm[i] + ebcdic_ii[i];
+ }
+ extern int foo;
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ ac_cv_c_bigendian=yes
+ fi
+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
+ else
+ # finding both strings is unlikely to happen, but who knows?
+ ac_cv_c_bigendian=unknown
+ fi
+ fi
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
main ()
{
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
- long int l;
- char c[sizeof (long int)];
- } u;
- u.l = 1;
- return u.c[sizeof (long int) - 1] == 1;
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+ long int l;
+ char c[sizeof (long int)];
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 1;
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_c_bigendian=no
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
+ ac_cv_c_bigendian=yes
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
+ fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+ yes)
+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+ no)
+ ;; #(
+ universal)
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
- yes)
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
- no)
- ;;
- *)
- { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
-esac
+ ;; #(
+ *)
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
case $target in
*mingw* | *cygw* | *win32* | *w32* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_WIN32 1
-_ACEOF
+ $as_echo "#define PJ_WIN32 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define PJ_WIN32_WINNT 0x0400
-_ACEOF
+ $as_echo "#define PJ_WIN32_WINNT 0x0400" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define WIN32_LEAN_AND_MEAN 1
-_ACEOF
+ $as_echo "#define WIN32_LEAN_AND_MEAN 1" >>confdefs.h
;;
*darwin*)
- cat >>confdefs.h <<\_ACEOF
-#define PJ_DARWINOS 1
-_ACEOF
+ $as_echo "#define PJ_DARWINOS 1" >>confdefs.h
;;
*linux*)
- cat >>confdefs.h <<\_ACEOF
-#define PJ_LINUX 1
-_ACEOF
+ $as_echo "#define PJ_LINUX 1" >>confdefs.h
;;
*rtems*)
- cat >>confdefs.h <<\_ACEOF
-#define PJ_RTEMS 1
-_ACEOF
+ $as_echo "#define PJ_RTEMS 1" >>confdefs.h
;;
*sunos* | *solaris* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_SUNOS 1
-_ACEOF
+ $as_echo "#define PJ_SUNOS 1" >>confdefs.h
;;
*)
@@ -4889,36 +4436,27 @@ esac
# Check whether --enable-floating-point was given.
-if test "${enable_floating_point+set}" = set; then
+if test "${enable_floating_point+set}" = set; then :
enableval=$enable_floating_point; if test "$enable_floating_point" = "no"; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_FLOATING_POINT 0
-_ACEOF
+ $as_echo "#define PJ_HAS_FLOATING_POINT 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if floating point is disabled... yes" >&5
-echo "${ECHO_T}Checking if floating point is disabled... yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... yes" >&5
+$as_echo "Checking if floating point is disabled... yes" >&6; }
fi
else
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_FLOATING_POINT 1
-_ACEOF
-
- { echo "$as_me:$LINENO: result: Checking if floating point is disabled... no" >&5
-echo "${ECHO_T}Checking if floating point is disabled... no" >&6; }
+ $as_echo "#define PJ_HAS_FLOATING_POINT 1" >>confdefs.h
-{ echo "$as_me:$LINENO: checking for fmod in -lm" >&5
-echo $ECHO_N "checking for fmod in -lm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_m_fmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5
+$as_echo "Checking if floating point is disabled... no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmod in -lm" >&5
+$as_echo_n "checking for fmod in -lm... " >&6; }
+if test "${ac_cv_lib_m_fmod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -4936,39 +4474,18 @@ return fmod ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_m_fmod=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_m_fmod=no
+ ac_cv_lib_m_fmod=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_fmod" >&5
-echo "${ECHO_T}$ac_cv_lib_m_fmod" >&6; }
-if test $ac_cv_lib_m_fmod = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fmod" >&5
+$as_echo "$ac_cv_lib_m_fmod" >&6; }
+if test "x$ac_cv_lib_m_fmod" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -4982,401 +4499,23 @@ fi
-if test "${ac_cv_header_arpa_inet_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for arpa/inet.h" >&5
-echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_arpa_inet_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5
-echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5
-echo $ECHO_N "checking arpa/inet.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <arpa/inet.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
+if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_ARPA_INET_H 1" >>confdefs.h
- ac_header_compiler=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5
-echo $ECHO_N "checking arpa/inet.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <arpa/inet.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_header_mongrel "$LINENO" "assert.h" "ac_cv_header_assert_h" "$ac_includes_default"
+if test "x$ac_cv_header_assert_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_ASSERT_H 1" >>confdefs.h
- ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: arpa/inet.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: arpa/inet.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: arpa/inet.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for arpa/inet.h" >&5
-echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_arpa_inet_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_arpa_inet_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5
-echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; }
-
-fi
-if test $ac_cv_header_arpa_inet_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_ARPA_INET_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_assert_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for assert.h" >&5
-echo $ECHO_N "checking for assert.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_assert_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_assert_h" >&5
-echo "${ECHO_T}$ac_cv_header_assert_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking assert.h usability" >&5
-echo $ECHO_N "checking assert.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <assert.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking assert.h presence" >&5
-echo $ECHO_N "checking assert.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <assert.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: assert.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: assert.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: assert.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: assert.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: assert.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: assert.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: assert.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: assert.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: assert.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: assert.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: assert.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: assert.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: assert.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: assert.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: assert.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: assert.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for assert.h" >&5
-echo $ECHO_N "checking for assert.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_assert_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_assert_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_assert_h" >&5
-echo "${ECHO_T}$ac_cv_header_assert_h" >&6; }
-
-fi
-if test $ac_cv_header_assert_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_ASSERT_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_ctype_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ctype.h" >&5
-echo $ECHO_N "checking for ctype.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ctype_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ctype_h" >&5
-echo "${ECHO_T}$ac_cv_header_ctype_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ctype.h usability" >&5
-echo $ECHO_N "checking ctype.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <ctype.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking ctype.h presence" >&5
-echo $ECHO_N "checking ctype.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: ctype.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ctype.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ctype.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ctype.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ctype.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ctype.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ctype.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ctype.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ctype.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ctype.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ctype.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ctype.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ctype.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ctype.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ctype.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ctype.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for ctype.h" >&5
-echo $ECHO_N "checking for ctype.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ctype_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_ctype_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ctype_h" >&5
-echo "${ECHO_T}$ac_cv_header_ctype_h" >&6; }
-
-fi
-if test $ac_cv_header_ctype_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_CTYPE_H 1
-_ACEOF
+ac_fn_c_check_header_mongrel "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default"
+if test "x$ac_cv_header_ctype_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_CTYPE_H 1" >>confdefs.h
fi
@@ -5384,3953 +4523,279 @@ fi
case $target in
*mingw* | *cygw* | *win32* | *w32* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_ERRNO_H 0
-_ACEOF
+ $as_echo "#define PJ_HAS_ERRNO_H 0" >>confdefs.h
;;
*)
- if test "${ac_cv_header_errno_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for errno.h" >&5
-echo $ECHO_N "checking for errno.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_errno_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_errno_h" >&5
-echo "${ECHO_T}$ac_cv_header_errno_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking errno.h usability" >&5
-echo $ECHO_N "checking errno.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <errno.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking errno.h presence" >&5
-echo $ECHO_N "checking errno.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <errno.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: errno.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: errno.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: errno.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: errno.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: errno.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: errno.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: errno.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: errno.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: errno.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: errno.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: errno.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: errno.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: errno.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: errno.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: errno.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: errno.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for errno.h" >&5
-echo $ECHO_N "checking for errno.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_errno_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_errno_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_errno_h" >&5
-echo "${ECHO_T}$ac_cv_header_errno_h" >&6; }
-
-fi
-if test $ac_cv_header_errno_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_ERRNO_H 1
-_ACEOF
-
-fi
-
-
- ;;
-esac
-
-if test "${ac_cv_header_fcntl_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for fcntl.h" >&5
-echo $ECHO_N "checking for fcntl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_fcntl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_fcntl_h" >&5
-echo "${ECHO_T}$ac_cv_header_fcntl_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking fcntl.h usability" >&5
-echo $ECHO_N "checking fcntl.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <fcntl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking fcntl.h presence" >&5
-echo $ECHO_N "checking fcntl.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <fcntl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
+ ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
+if test "x$ac_cv_header_errno_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_ERRNO_H 1" >>confdefs.h
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: fcntl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: fcntl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: fcntl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: fcntl.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: fcntl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: fcntl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: fcntl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: fcntl.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: fcntl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: fcntl.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: fcntl.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: fcntl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: fcntl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: fcntl.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: fcntl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: fcntl.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for fcntl.h" >&5
-echo $ECHO_N "checking for fcntl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_fcntl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_fcntl_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_fcntl_h" >&5
-echo "${ECHO_T}$ac_cv_header_fcntl_h" >&6; }
-
-fi
-if test $ac_cv_header_fcntl_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_FCNTL_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_linux_socket_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for linux/socket.h" >&5
-echo $ECHO_N "checking for linux/socket.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_socket_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_socket_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_socket_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking linux/socket.h usability" >&5
-echo $ECHO_N "checking linux/socket.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <linux/socket.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking linux/socket.h presence" >&5
-echo $ECHO_N "checking linux/socket.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <linux/socket.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: linux/socket.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: linux/socket.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: linux/socket.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: linux/socket.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: linux/socket.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: linux/socket.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: linux/socket.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/socket.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: linux/socket.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for linux/socket.h" >&5
-echo $ECHO_N "checking for linux/socket.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_socket_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_linux_socket_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_socket_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_socket_h" >&6; }
-
-fi
-if test $ac_cv_header_linux_socket_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_LINUX_SOCKET_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_malloc_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for malloc.h" >&5
-echo $ECHO_N "checking for malloc.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_malloc_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_malloc_h" >&5
-echo "${ECHO_T}$ac_cv_header_malloc_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking malloc.h usability" >&5
-echo $ECHO_N "checking malloc.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <malloc.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking malloc.h presence" >&5
-echo $ECHO_N "checking malloc.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <malloc.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: malloc.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: malloc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: malloc.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: malloc.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: malloc.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: malloc.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: malloc.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: malloc.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: malloc.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: malloc.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: malloc.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: malloc.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: malloc.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: malloc.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: malloc.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: malloc.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for malloc.h" >&5
-echo $ECHO_N "checking for malloc.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_malloc_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_malloc_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_malloc_h" >&5
-echo "${ECHO_T}$ac_cv_header_malloc_h" >&6; }
-
-fi
-if test $ac_cv_header_malloc_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_MALLOC_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_netdb_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for netdb.h" >&5
-echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_netdb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5
-echo "${ECHO_T}$ac_cv_header_netdb_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking netdb.h usability" >&5
-echo $ECHO_N "checking netdb.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <netdb.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking netdb.h presence" >&5
-echo $ECHO_N "checking netdb.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <netdb.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: netdb.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: netdb.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: netdb.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: netdb.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: netdb.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: netdb.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: netdb.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: netdb.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for netdb.h" >&5
-echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_netdb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_netdb_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5
-echo "${ECHO_T}$ac_cv_header_netdb_h" >&6; }
-
-fi
-if test $ac_cv_header_netdb_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_NETDB_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_netinet_in_systm_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for netinet/in_systm.h" >&5
-echo $ECHO_N "checking for netinet/in_systm.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_netinet_in_systm_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_systm_h" >&5
-echo "${ECHO_T}$ac_cv_header_netinet_in_systm_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking netinet/in_systm.h usability" >&5
-echo $ECHO_N "checking netinet/in_systm.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <netinet/in_systm.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking netinet/in_systm.h presence" >&5
-echo $ECHO_N "checking netinet/in_systm.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <netinet/in_systm.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in_systm.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: netinet/in_systm.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for netinet/in_systm.h" >&5
-echo $ECHO_N "checking for netinet/in_systm.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_netinet_in_systm_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_netinet_in_systm_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_systm_h" >&5
-echo "${ECHO_T}$ac_cv_header_netinet_in_systm_h" >&6; }
-
-fi
-if test $ac_cv_header_netinet_in_systm_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_NETINET_IN_SYSTM_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_netinet_in_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for netinet/in.h" >&5
-echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_netinet_in_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
-echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking netinet/in.h usability" >&5
-echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <netinet/in.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking netinet/in.h presence" >&5
-echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <netinet/in.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for netinet/in.h" >&5
-echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_netinet_in_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_netinet_in_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
-echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; }
-
-fi
-if test $ac_cv_header_netinet_in_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_NETINET_IN_H 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for netinet/ip.h" >&5
-echo $ECHO_N "checking for netinet/ip.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_netinet_ip_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if PJ_HAS_NETINET_IN_SYSTM_H
- # include <netinet/in_systm.h>
- #endif
-
-
-#include <netinet/ip.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_netinet_ip_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_netinet_ip_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_ip_h" >&5
-echo "${ECHO_T}$ac_cv_header_netinet_ip_h" >&6; }
-if test $ac_cv_header_netinet_ip_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_NETINET_IP_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_ifaddrs_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ifaddrs.h" >&5
-echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ifaddrs_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5
-echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ifaddrs.h usability" >&5
-echo $ECHO_N "checking ifaddrs.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <ifaddrs.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking ifaddrs.h presence" >&5
-echo $ECHO_N "checking ifaddrs.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ifaddrs.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ifaddrs.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ifaddrs.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ifaddrs.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for ifaddrs.h" >&5
-echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ifaddrs_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_ifaddrs_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5
-echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; }
-
-fi
-if test $ac_cv_header_ifaddrs_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_IFADDRS_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_semaphore_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for semaphore.h" >&5
-echo $ECHO_N "checking for semaphore.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_semaphore_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_semaphore_h" >&5
-echo "${ECHO_T}$ac_cv_header_semaphore_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking semaphore.h usability" >&5
-echo $ECHO_N "checking semaphore.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <semaphore.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking semaphore.h presence" >&5
-echo $ECHO_N "checking semaphore.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <semaphore.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: semaphore.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: semaphore.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: semaphore.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: semaphore.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: semaphore.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: semaphore.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: semaphore.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: semaphore.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: semaphore.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: semaphore.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: semaphore.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: semaphore.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: semaphore.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: semaphore.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: semaphore.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: semaphore.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for semaphore.h" >&5
-echo $ECHO_N "checking for semaphore.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_semaphore_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_semaphore_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_semaphore_h" >&5
-echo "${ECHO_T}$ac_cv_header_semaphore_h" >&6; }
-
-fi
-if test $ac_cv_header_semaphore_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SEMAPHORE_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_setjmp_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for setjmp.h" >&5
-echo $ECHO_N "checking for setjmp.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_setjmp_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_setjmp_h" >&5
-echo "${ECHO_T}$ac_cv_header_setjmp_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking setjmp.h usability" >&5
-echo $ECHO_N "checking setjmp.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <setjmp.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking setjmp.h presence" >&5
-echo $ECHO_N "checking setjmp.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <setjmp.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: setjmp.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: setjmp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: setjmp.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: setjmp.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: setjmp.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: setjmp.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: setjmp.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: setjmp.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: setjmp.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: setjmp.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: setjmp.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: setjmp.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: setjmp.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: setjmp.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: setjmp.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: setjmp.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for setjmp.h" >&5
-echo $ECHO_N "checking for setjmp.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_setjmp_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_setjmp_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_setjmp_h" >&5
-echo "${ECHO_T}$ac_cv_header_setjmp_h" >&6; }
-
-fi
-if test $ac_cv_header_setjmp_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SETJMP_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_stdarg_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for stdarg.h" >&5
-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdarg_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking stdarg.h usability" >&5
-echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <stdarg.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking stdarg.h presence" >&5
-echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdarg.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdarg.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: stdarg.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdarg.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdarg.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdarg.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdarg.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdarg.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdarg.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdarg.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdarg.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for stdarg.h" >&5
-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdarg_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_stdarg_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6; }
-
-fi
-if test $ac_cv_header_stdarg_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_STDARG_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_stddef_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for stddef.h" >&5
-echo $ECHO_N "checking for stddef.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stddef_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stddef_h" >&5
-echo "${ECHO_T}$ac_cv_header_stddef_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking stddef.h usability" >&5
-echo $ECHO_N "checking stddef.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <stddef.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking stddef.h presence" >&5
-echo $ECHO_N "checking stddef.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stddef.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: stddef.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stddef.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: stddef.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stddef.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: stddef.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stddef.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: stddef.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stddef.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: stddef.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stddef.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: stddef.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stddef.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: stddef.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stddef.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: stddef.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stddef.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for stddef.h" >&5
-echo $ECHO_N "checking for stddef.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stddef_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_stddef_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stddef_h" >&5
-echo "${ECHO_T}$ac_cv_header_stddef_h" >&6; }
-
-fi
-if test $ac_cv_header_stddef_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_STDDEF_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_stdio_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for stdio.h" >&5
-echo $ECHO_N "checking for stdio.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdio_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdio_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdio_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking stdio.h usability" >&5
-echo $ECHO_N "checking stdio.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <stdio.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking stdio.h presence" >&5
-echo $ECHO_N "checking stdio.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdio.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: stdio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdio.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdio.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: stdio.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdio.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdio.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdio.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdio.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdio.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdio.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdio.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdio.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdio.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdio.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdio.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for stdio.h" >&5
-echo $ECHO_N "checking for stdio.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdio_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_stdio_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdio_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdio_h" >&6; }
-
-fi
-if test $ac_cv_header_stdio_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_STDIO_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_stdint_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdint_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking stdint.h usability" >&5
-echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <stdint.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking stdint.h presence" >&5
-echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdint.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdint.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdint.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdint_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_stdint_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdint_h" >&6; }
-
-fi
-if test $ac_cv_header_stdint_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_STDINT_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_stdlib_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for stdlib.h" >&5
-echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking stdlib.h usability" >&5
-echo $ECHO_N "checking stdlib.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <stdlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking stdlib.h presence" >&5
-echo $ECHO_N "checking stdlib.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdlib.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: stdlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdlib.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdlib.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdlib.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdlib.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdlib.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdlib.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: stdlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdlib.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for stdlib.h" >&5
-echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_stdlib_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6; }
-
-fi
-if test $ac_cv_header_stdlib_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_STDLIB_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_string_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for string.h" >&5
-echo $ECHO_N "checking for string.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_string_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_string_h" >&5
-echo "${ECHO_T}$ac_cv_header_string_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking string.h usability" >&5
-echo $ECHO_N "checking string.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <string.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking string.h presence" >&5
-echo $ECHO_N "checking string.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: string.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: string.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: string.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: string.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: string.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: string.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: string.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: string.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: string.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: string.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: string.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: string.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: string.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: string.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: string.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: string.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for string.h" >&5
-echo $ECHO_N "checking for string.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_string_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_string_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_string_h" >&5
-echo "${ECHO_T}$ac_cv_header_string_h" >&6; }
-
-fi
-if test $ac_cv_header_string_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_STRING_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_sys_ioctl_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for sys/ioctl.h" >&5
-echo $ECHO_N "checking for sys/ioctl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_ioctl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ioctl_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_ioctl_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/ioctl.h usability" >&5
-echo $ECHO_N "checking sys/ioctl.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/ioctl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/ioctl.h presence" >&5
-echo $ECHO_N "checking sys/ioctl.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/ioctl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/ioctl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/ioctl.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/ioctl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/ioctl.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/ioctl.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/ioctl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/ioctl.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/ioctl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/ioctl.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/ioctl.h" >&5
-echo $ECHO_N "checking for sys/ioctl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_ioctl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_sys_ioctl_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ioctl_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_ioctl_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_ioctl_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SYS_IOCTL_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_sys_select_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for sys/select.h" >&5
-echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_select_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/select.h usability" >&5
-echo $ECHO_N "checking sys/select.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/select.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/select.h presence" >&5
-echo $ECHO_N "checking sys/select.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/select.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/select.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/select.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/select.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/select.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/select.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/select.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/select.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/select.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/select.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/select.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/select.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/select.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/select.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/select.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/select.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/select.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/select.h" >&5
-echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_select_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_sys_select_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_select_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SYS_SELECT_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_sys_socket_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for sys/socket.h" >&5
-echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_socket_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/socket.h usability" >&5
-echo $ECHO_N "checking sys/socket.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/socket.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/socket.h presence" >&5
-echo $ECHO_N "checking sys/socket.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/socket.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/socket.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/socket.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/socket.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/socket.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/socket.h" >&5
-echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_socket_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_sys_socket_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_socket_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SYS_SOCKET_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_sys_time_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for sys/time.h" >&5
-echo $ECHO_N "checking for sys/time.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_time_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_time_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_time_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/time.h usability" >&5
-echo $ECHO_N "checking sys/time.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/time.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/time.h presence" >&5
-echo $ECHO_N "checking sys/time.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/time.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/time.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/time.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/time.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/time.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/time.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/time.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/time.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/time.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/time.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/time.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/time.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/time.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/time.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/time.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/time.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/time.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/time.h" >&5
-echo $ECHO_N "checking for sys/time.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_time_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_sys_time_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_time_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_time_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_time_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SYS_TIME_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_sys_timeb_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for sys/timeb.h" >&5
-echo $ECHO_N "checking for sys/timeb.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_timeb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_timeb_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_timeb_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/timeb.h usability" >&5
-echo $ECHO_N "checking sys/timeb.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/timeb.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/timeb.h presence" >&5
-echo $ECHO_N "checking sys/timeb.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/timeb.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/timeb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/timeb.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/timeb.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/timeb.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/timeb.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/timeb.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/timeb.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/timeb.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/timeb.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/timeb.h" >&5
-echo $ECHO_N "checking for sys/timeb.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_timeb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_sys_timeb_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_timeb_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_timeb_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_timeb_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SYS_TIMEB_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_sys_types_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for sys/types.h" >&5
-echo $ECHO_N "checking for sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_types_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_types_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_types_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/types.h usability" >&5
-echo $ECHO_N "checking sys/types.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/types.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/types.h presence" >&5
-echo $ECHO_N "checking sys/types.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/types.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/types.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/types.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/types.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/types.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/types.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/types.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/types.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/types.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/types.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/types.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/types.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/types.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/types.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/types.h" >&5
-echo $ECHO_N "checking for sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_types_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_sys_types_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_types_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_types_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_types_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SYS_TYPES_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_time_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for time.h" >&5
-echo $ECHO_N "checking for time.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_time_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time_h" >&5
-echo "${ECHO_T}$ac_cv_header_time_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking time.h usability" >&5
-echo $ECHO_N "checking time.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <time.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking time.h presence" >&5
-echo $ECHO_N "checking time.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <time.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: time.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: time.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: time.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: time.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: time.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: time.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: time.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: time.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: time.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: time.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: time.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: time.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: time.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: time.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: time.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: time.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for time.h" >&5
-echo $ECHO_N "checking for time.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_time_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_time_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time_h" >&5
-echo "${ECHO_T}$ac_cv_header_time_h" >&6; }
-
-fi
-if test $ac_cv_header_time_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_TIME_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_unistd_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for unistd.h" >&5
-echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_unistd_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_unistd_h" >&5
-echo "${ECHO_T}$ac_cv_header_unistd_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking unistd.h usability" >&5
-echo $ECHO_N "checking unistd.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <unistd.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking unistd.h presence" >&5
-echo $ECHO_N "checking unistd.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <unistd.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: unistd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: unistd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: unistd.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: unistd.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: unistd.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: unistd.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: unistd.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: unistd.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: unistd.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: unistd.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for unistd.h" >&5
-echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_unistd_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_unistd_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_unistd_h" >&5
-echo "${ECHO_T}$ac_cv_header_unistd_h" >&6; }
-
-fi
-if test $ac_cv_header_unistd_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_UNISTD_H 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_winsock_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for winsock.h" >&5
-echo $ECHO_N "checking for winsock.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_winsock_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_winsock_h" >&5
-echo "${ECHO_T}$ac_cv_header_winsock_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking winsock.h usability" >&5
-echo $ECHO_N "checking winsock.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <winsock.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking winsock.h presence" >&5
-echo $ECHO_N "checking winsock.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <winsock.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+
+
+ ;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
+ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_FCNTL_H 1" >>confdefs.h
+
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: winsock.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: winsock.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: winsock.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: winsock.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: winsock.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: winsock.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: winsock.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: winsock.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: winsock.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: winsock.h: in the future, the compiler will take precedence" >&2;}
+ac_fn_c_check_header_mongrel "$LINENO" "linux/socket.h" "ac_cv_header_linux_socket_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_socket_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_LINUX_SOCKET_H 1" >>confdefs.h
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for winsock.h" >&5
-echo $ECHO_N "checking for winsock.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_winsock_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_winsock_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_winsock_h" >&5
-echo "${ECHO_T}$ac_cv_header_winsock_h" >&6; }
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
+if test "x$ac_cv_header_malloc_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_MALLOC_H 1" >>confdefs.h
fi
-if test $ac_cv_header_winsock_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_WINSOCK_H 1
-_ACEOF
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default"
+if test "x$ac_cv_header_netdb_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_NETDB_H 1" >>confdefs.h
fi
-if test "${ac_cv_header_winsock2_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for winsock2.h" >&5
-echo $ECHO_N "checking for winsock2.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_winsock2_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_NETINET_IN_SYSTM_H 1" >>confdefs.h
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_winsock2_h" >&5
-echo "${ECHO_T}$ac_cv_header_winsock2_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking winsock2.h usability" >&5
-echo $ECHO_N "checking winsock2.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <winsock2.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+
+ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_NETINET_IN_H 1" >>confdefs.h
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking winsock2.h presence" >&5
-echo $ECHO_N "checking winsock2.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <winsock2.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "#if PJ_HAS_NETINET_IN_SYSTM_H
+ # include <netinet/in_systm.h>
+ #endif
+
+"
+if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_NETINET_IP_H 1" >>confdefs.h
- ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: winsock2.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: winsock2.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock2.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: winsock2.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: winsock2.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: winsock2.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock2.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: winsock2.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock2.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: winsock2.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock2.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: winsock2.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock2.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: winsock2.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: winsock2.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: winsock2.h: in the future, the compiler will take precedence" >&2;}
+ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
+if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_IFADDRS_H 1" >>confdefs.h
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for winsock2.h" >&5
-echo $ECHO_N "checking for winsock2.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_winsock2_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_winsock2_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_winsock2_h" >&5
-echo "${ECHO_T}$ac_cv_header_winsock2_h" >&6; }
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h" "$ac_includes_default"
+if test "x$ac_cv_header_semaphore_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SEMAPHORE_H 1" >>confdefs.h
fi
-if test $ac_cv_header_winsock2_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_WINSOCK2_H 1
-_ACEOF
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default"
+if test "x$ac_cv_header_setjmp_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SETJMP_H 1" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: checking for mswsock.h" >&5
-echo $ECHO_N "checking for mswsock.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_mswsock_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if PJ_HAS_WINSOCK2_H
- # include <winsock2.h>
- #elif PJ_HAS_WINSOCK_H
- # include <winsock.h>
- #endif
+ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdarg_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_STDARG_H 1" >>confdefs.h
+fi
-#include <mswsock.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_mswsock_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_mswsock_h=no
+ac_fn_c_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
+if test "x$ac_cv_header_stddef_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_STDDEF_H 1" >>confdefs.h
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ac_fn_c_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdio_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_STDIO_H 1" >>confdefs.h
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_mswsock_h" >&5
-echo "${ECHO_T}$ac_cv_header_mswsock_h" >&6; }
-if test $ac_cv_header_mswsock_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_MSWSOCK_H 1
-_ACEOF
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_STDINT_H 1" >>confdefs.h
fi
-if test "${ac_cv_header_ws2tcpip_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ws2tcpip.h" >&5
-echo $ECHO_N "checking for ws2tcpip.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ws2tcpip_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_STDLIB_H 1" >>confdefs.h
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ws2tcpip_h" >&5
-echo "${ECHO_T}$ac_cv_header_ws2tcpip_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ws2tcpip.h usability" >&5
-echo $ECHO_N "checking ws2tcpip.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <ws2tcpip.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+
+ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
+if test "x$ac_cv_header_string_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_STRING_H 1" >>confdefs.h
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking ws2tcpip.h presence" >&5
-echo $ECHO_N "checking ws2tcpip.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ws2tcpip.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ioctl_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SYS_IOCTL_H 1" >>confdefs.h
- ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ws2tcpip.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ws2tcpip.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ws2tcpip.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ws2tcpip.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ws2tcpip.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ws2tcpip.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ws2tcpip.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ws2tcpip.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ws2tcpip.h: in the future, the compiler will take precedence" >&2;}
+ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_select_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SYS_SELECT_H 1" >>confdefs.h
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for ws2tcpip.h" >&5
-echo $ECHO_N "checking for ws2tcpip.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ws2tcpip_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_ws2tcpip_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ws2tcpip_h" >&5
-echo "${ECHO_T}$ac_cv_header_ws2tcpip_h" >&6; }
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_socket_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SYS_SOCKET_H 1" >>confdefs.h
fi
-if test $ac_cv_header_ws2tcpip_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_WS2TCPIP_H 1
-_ACEOF
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SYS_TIME_H 1" >>confdefs.h
fi
-if test "${ac_cv_header_uuid_uuid_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5
-echo $ECHO_N "checking for uuid/uuid.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_uuid_uuid_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_timeb_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SYS_TIMEB_H 1" >>confdefs.h
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5
-echo "${ECHO_T}$ac_cv_header_uuid_uuid_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking uuid/uuid.h usability" >&5
-echo $ECHO_N "checking uuid/uuid.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <uuid/uuid.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_types_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_SYS_TYPES_H 1" >>confdefs.h
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking uuid/uuid.h presence" >&5
-echo $ECHO_N "checking uuid/uuid.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <uuid/uuid.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_time_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_TIME_H 1" >>confdefs.h
- ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: uuid/uuid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: uuid/uuid.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: uuid/uuid.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: uuid/uuid.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: uuid/uuid.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: uuid/uuid.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: uuid/uuid.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: uuid/uuid.h: in the future, the compiler will take precedence" >&2;}
+ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_UNISTD_H 1" >>confdefs.h
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for uuid/uuid.h" >&5
-echo $ECHO_N "checking for uuid/uuid.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_uuid_uuid_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_uuid_uuid_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_uuid_uuid_h" >&5
-echo "${ECHO_T}$ac_cv_header_uuid_uuid_h" >&6; }
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "winsock.h" "ac_cv_header_winsock_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_WINSOCK_H 1" >>confdefs.h
fi
-if test $ac_cv_header_uuid_uuid_h = yes; then
- ac_has_uuid_h=1
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_WINSOCK2_H 1" >>confdefs.h
+
fi
-{ echo "$as_me:$LINENO: checking for net/if.h" >&5
-echo $ECHO_N "checking for net/if.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_net_if_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if PJ_HAS_SYS_SOCKET_H
- # include <sys/socket.h>
+ac_fn_c_check_header_compile "$LINENO" "mswsock.h" "ac_cv_header_mswsock_h" "#if PJ_HAS_WINSOCK2_H
+ # include <winsock2.h>
+ #elif PJ_HAS_WINSOCK_H
+ # include <winsock.h>
#endif
+"
+if test "x$ac_cv_header_mswsock_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_MSWSOCK_H 1" >>confdefs.h
+
+fi
-#include <net/if.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_net_if_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_net_if_h=no
+ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+if test "x$ac_cv_header_ws2tcpip_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_WS2TCPIP_H 1" >>confdefs.h
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then :
+ ac_has_uuid_h=1
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_net_if_h" >&5
-echo "${ECHO_T}$ac_cv_header_net_if_h" >&6; }
-if test $ac_cv_header_net_if_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_NET_IF_H 1
-_ACEOF
+
+
+ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#if PJ_HAS_SYS_SOCKET_H
+ # include <sys/socket.h>
+ #endif
+
+"
+if test "x$ac_cv_header_net_if_h" = x""yes; then :
+ $as_echo "#define PJ_HAS_NET_IF_H 1" >>confdefs.h
fi
-{ echo "$as_me:$LINENO: result: Setting PJ_OS_NAME to $target" >&5
-echo "${ECHO_T}Setting PJ_OS_NAME to $target" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_OS_NAME to $target" >&5
+$as_echo "Setting PJ_OS_NAME to $target" >&6; }
cat >>confdefs.h <<_ACEOF
#define PJ_OS_NAME "$target"
_ACEOF
-{ echo "$as_me:$LINENO: result: Setting PJ_HAS_ERRNO_VAR to 1" >&5
-echo "${ECHO_T}Setting PJ_HAS_ERRNO_VAR to 1" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_ERRNO_VAR 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_ERRNO_VAR to 1" >&5
+$as_echo "Setting PJ_HAS_ERRNO_VAR to 1" >&6; }
+$as_echo "#define PJ_HAS_ERRNO_VAR 1" >>confdefs.h
-{ echo "$as_me:$LINENO: result: Setting PJ_HAS_HIGH_RES_TIMER to 1" >&5
-echo "${ECHO_T}Setting PJ_HAS_HIGH_RES_TIMER to 1" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_HIGH_RES_TIMER 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_HIGH_RES_TIMER to 1" >&5
+$as_echo "Setting PJ_HAS_HIGH_RES_TIMER to 1" >&6; }
+$as_echo "#define PJ_HAS_HIGH_RES_TIMER 1" >>confdefs.h
-{ echo "$as_me:$LINENO: result: Setting PJ_HAS_MALLOC to 1" >&5
-echo "${ECHO_T}Setting PJ_HAS_MALLOC to 1" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_MALLOC 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_MALLOC to 1" >&5
+$as_echo "Setting PJ_HAS_MALLOC to 1" >&6; }
+$as_echo "#define PJ_HAS_MALLOC 1" >>confdefs.h
-{ echo "$as_me:$LINENO: result: Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&5
-echo "${ECHO_T}Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define PJ_NATIVE_STRING_IS_UNICODE 0
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&5
+$as_echo "Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&6; }
+$as_echo "#define PJ_NATIVE_STRING_IS_UNICODE 0" >>confdefs.h
-{ echo "$as_me:$LINENO: result: Setting PJ_ATOMIC_VALUE_TYPE to long" >&5
-echo "${ECHO_T}Setting PJ_ATOMIC_VALUE_TYPE to long" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define PJ_ATOMIC_VALUE_TYPE long
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_ATOMIC_VALUE_TYPE to long" >&5
+$as_echo "Setting PJ_ATOMIC_VALUE_TYPE to long" >&6; }
+$as_echo "#define PJ_ATOMIC_VALUE_TYPE long" >>confdefs.h
-{ echo "$as_me:$LINENO: checking if inet_aton() is available" >&5
-echo $ECHO_N "checking if inet_aton() is available... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if inet_aton() is available" >&5
+$as_echo_n "checking if inet_aton() is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
@@ -9343,46 +4808,20 @@ inet_aton(0, 0);
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_SOCK_HAS_INET_ATON 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_SOCK_HAS_INET_ATON 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking if inet_pton() is available" >&5
-echo $ECHO_N "checking if inet_pton() is available... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if inet_pton() is available" >&5
+$as_echo_n "checking if inet_pton() is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
@@ -9393,48 +4832,22 @@ main ()
inet_pton(0, 0, 0);
;
return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_SOCK_HAS_INET_PTON 1
+}
_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_SOCK_HAS_INET_PTON 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking if inet_ntop() is available" >&5
-echo $ECHO_N "checking if inet_ntop() is available... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if inet_ntop() is available" >&5
+$as_echo_n "checking if inet_ntop() is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
@@ -9447,46 +4860,20 @@ inet_ntop(0, 0, 0, 0);
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_SOCK_HAS_INET_NTOP 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_SOCK_HAS_INET_NTOP 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking if getaddrinfo() is available" >&5
-echo $ECHO_N "checking if getaddrinfo() is available... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo() is available" >&5
+$as_echo_n "checking if getaddrinfo() is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
@@ -9499,46 +4886,20 @@ getaddrinfo(0, 0, 0, 0);
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_SOCK_HAS_GETADDRINFO 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_SOCK_HAS_GETADDRINFO 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking if sockaddr_in has sin_len member" >&5
-echo $ECHO_N "checking if sockaddr_in has sin_len member... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr_in has sin_len member" >&5
+$as_echo_n "checking if sockaddr_in has sin_len member... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
@@ -9552,46 +4913,20 @@ struct sockaddr_in a; a.sin_len=0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_SOCKADDR_HAS_LEN 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_SOCKADDR_HAS_LEN 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking if socklen_t is available" >&5
-echo $ECHO_N "checking if socklen_t is available... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if socklen_t is available" >&5
+$as_echo_n "checking if socklen_t is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/socket.h>
int
@@ -9602,56 +4937,28 @@ socklen_t xxx = 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SOCKLEN_T 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_HAS_SOCKLEN_T 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking if SO_ERROR is available" >&5
-echo $ECHO_N "checking if SO_ERROR is available... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SO_ERROR is available" >&5
+$as_echo_n "checking if SO_ERROR is available... " >&6; }
case $target in
*mingw* | *cygw* | *win32* | *w32* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SO_ERROR 1
-_ACEOF
+ $as_echo "#define PJ_HAS_SO_ERROR 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
;;
*)
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
@@ -9665,49 +4972,23 @@ int i=SO_ERROR;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_SO_ERROR 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_HAS_SO_ERROR 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;;
esac
-{ echo "$as_me:$LINENO: checking if pthread_rwlock_t is available" >&5
-echo $ECHO_N "checking if pthread_rwlock_t is available... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_rwlock_t is available" >&5
+$as_echo_n "checking if pthread_rwlock_t is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
int
@@ -9718,53 +4999,25 @@ pthread_rwlock_t *x;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_EMULATE_RWMUTEX 0
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h
ac_rwmutex="yes"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >>confdefs.h <<\_ACEOF
-#define PJ_EMULATE_RWMUTEX 1
-_ACEOF
+ $as_echo "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h
ac_rwmutex="no"
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$ac_rwmutex" = "no"; then
- { echo "$as_me:$LINENO: checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS" >&5
-echo $ECHO_N "checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS" >&5
+$as_echo_n "checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _POSIX_READER_WRITER_LOCKS
#include <pthread.h>
@@ -9776,52 +5029,24 @@ pthread_rwlock_t *x;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_EMULATE_RWMUTEX 0
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h
CFLAGS="$CFLAGS -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ $as_echo "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
-#define PJ_EMULATE_RWMUTEX 1
-_ACEOF
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: checking if pthread_mutexattr_settype() is available" >&5
-echo $ECHO_N "checking if pthread_mutexattr_settype() is available... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_mutexattr_settype() is available" >&5
+$as_echo_n "checking if pthread_mutexattr_settype() is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
int
@@ -9832,46 +5057,20 @@ pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP);
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking if pthread_mutexattr_t has recursive member" >&5
-echo $ECHO_N "checking if pthread_mutexattr_t has recursive member... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_mutexattr_t has recursive member" >&5
+$as_echo_n "checking if pthread_mutexattr_t has recursive member... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
int
@@ -9881,478 +5080,84 @@ pthread_mutexattr_t attr;
attr.recursive=1;
;
return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >>confdefs.h <<\_ACEOF
-#define PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE 1
-_ACEOF
-
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-{ echo "$as_me:$LINENO: checking ioqueue backend" >&5
-echo $ECHO_N "checking ioqueue backend... $ECHO_C" >&6; }
-# Check whether --enable-epoll was given.
-if test "${enable_epoll+set}" = set; then
- enableval=$enable_epoll;
- ac_os_objs=ioqueue_epoll.o
- { echo "$as_me:$LINENO: result: /dev/epoll" >&5
-echo "${ECHO_T}/dev/epoll" >&6; }
-
-else
-
- ac_os_objs=ioqueue_select.o
- { echo "$as_me:$LINENO: result: select()" >&5
-echo "${ECHO_T}select()" >&6; }
-
-fi
-
-
-
-case $target in
- *mingw* | *cygw* | *win32* | *w32* )
- ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o"
- ;;
- *)
- ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o"
- # UUID
- if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
- ac_os_objs="$ac_os_objs guid_uuid.o"
- else
- ac_os_objs="$ac_os_objs guid_simple.o"
- fi
- ;;
-esac
-
-
-
-
-
-# Check whether --enable-sound was given.
-if test "${enable_sound+set}" = set; then
- enableval=$enable_sound; if test "$enable_sound" = "no"; then
- ac_pjmedia_snd=null
- { echo "$as_me:$LINENO: result: Checking if sound is disabled... yes" >&5
-echo "${ECHO_T}Checking if sound is disabled... yes" >&6; }
- fi
-
-fi
-
-
-
-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
-echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5
-echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/soundcard.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5
-echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/soundcard.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
-echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_sys_soundcard_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_soundcard_h = yes; then
- ac_pa_cflags="$ac_pa_cflags -DHAVE_SYS_SOUNDCARD_H"
-fi
-
-
-if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
-echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking linux/soundcard.h usability" >&5
-echo $ECHO_N "checking linux/soundcard.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <linux/soundcard.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking linux/soundcard.h presence" >&5
-echo $ECHO_N "checking linux/soundcard.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <linux/soundcard.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "#define PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE 1" >>confdefs.h
- ac_header_preproc=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: linux/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: linux/soundcard.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: linux/soundcard.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: linux/soundcard.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: linux/soundcard.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: linux/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: linux/soundcard.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: linux/soundcard.h: in the future, the compiler will take precedence" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5
+$as_echo_n "checking ioqueue backend... " >&6; }
+# Check whether --enable-epoll was given.
+if test "${enable_epoll+set}" = set; then :
+ enableval=$enable_epoll;
+ ac_os_objs=ioqueue_epoll.o
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5
+$as_echo "/dev/epoll" >&6; }
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
-echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_linux_soundcard_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6; }
-fi
-if test $ac_cv_header_linux_soundcard_h = yes; then
- ac_pa_cflags="$ac_pa_cflags -DHAVE_LINUX_SOUNDCARD_H"
+ ac_os_objs=ioqueue_select.o
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: select()" >&5
+$as_echo "select()" >&6; }
+
fi
-if test "${ac_cv_header_machine_soundcard_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5
-echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_machine_soundcard_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking machine/soundcard.h usability" >&5
-echo $ECHO_N "checking machine/soundcard.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <machine/soundcard.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+
+case $target in
+ *mingw* | *cygw* | *win32* | *w32* )
+ ac_os_objs="$ac_os_objs file_access_win32.o file_io_win32.o os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o"
+ ;;
+ *)
+ ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o"
+ # UUID
+ if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
+ ac_os_objs="$ac_os_objs guid_uuid.o"
+ else
+ ac_os_objs="$ac_os_objs guid_simple.o"
+ fi
+ ;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking machine/soundcard.h presence" >&5
-echo $ECHO_N "checking machine/soundcard.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <machine/soundcard.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
+
+# Check whether --enable-sound was given.
+if test "${enable_sound+set}" = set; then :
+ enableval=$enable_sound; if test "$enable_sound" = "no"; then
+ ac_pjmedia_snd=null
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if sound is disabled... yes" >&5
+$as_echo "Checking if sound is disabled... yes" >&6; }
+ fi
+
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: machine/soundcard.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: machine/soundcard.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: machine/soundcard.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: machine/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: machine/soundcard.h: in the future, the compiler will take precedence" >&2;}
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5
-echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_machine_soundcard_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_machine_soundcard_h=$ac_header_preproc
+ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then :
+ ac_pa_cflags="$ac_pa_cflags -DHAVE_SYS_SOUNDCARD_H"
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5
-echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6; }
+
+ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_soundcard_h" = x""yes; then :
+ ac_pa_cflags="$ac_pa_cflags -DHAVE_LINUX_SOUNDCARD_H"
fi
-if test $ac_cv_header_machine_soundcard_h = yes; then
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "machine/soundcard.h" "ac_cv_header_machine_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_machine_soundcard_h" = x""yes; then :
ac_pa_cflags="$ac_pa_cflags -DHAVE_MACHINE_SOUNDCARD_H"
fi
@@ -10374,152 +5179,28 @@ else
#ac_pa_cflags="$ac_pa_cflags -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS"
#AC_MSG_RESULT([Setting additional PortAudio CFLAGS.. -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS])
ac_pjmedia_snd=pa_old_darwinos
- { echo "$as_me:$LINENO: result: Checking sound device backend... old coreaudio" >&5
-echo "${ECHO_T}Checking sound device backend... old coreaudio" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... old coreaudio" >&5
+$as_echo "Checking sound device backend... old coreaudio" >&6; }
else
ac_pjmedia_snd=pa_darwinos
- { echo "$as_me:$LINENO: result: Checking sound device backend... coreaudio" >&5
-echo "${ECHO_T}Checking sound device backend... coreaudio" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... coreaudio" >&5
+$as_echo "Checking sound device backend... coreaudio" >&6; }
fi
;;
*cygwin* | *mingw*)
ac_pjmedia_snd=pa_win32
- { echo "$as_me:$LINENO: result: Checking sound device backend... win32 sound" >&5
-echo "${ECHO_T}Checking sound device backend... win32 sound" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... win32 sound" >&5
+$as_echo "Checking sound device backend... win32 sound" >&6; }
;;
*rtems*)
ac_pjmedia_snd=null
- { echo "$as_me:$LINENO: result: Checking sound device backend... null sound" >&5
-echo "${ECHO_T}Checking sound device backend... null sound" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5
+$as_echo "Checking sound device backend... null sound" >&6; }
;;
*)
ac_pjmedia_snd=pa_unix
- if test "${ac_cv_header_alsa_version_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for alsa/version.h" >&5
-echo $ECHO_N "checking for alsa/version.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_alsa_version_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_version_h" >&5
-echo "${ECHO_T}$ac_cv_header_alsa_version_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking alsa/version.h usability" >&5
-echo $ECHO_N "checking alsa/version.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <alsa/version.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking alsa/version.h presence" >&5
-echo $ECHO_N "checking alsa/version.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <alsa/version.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: alsa/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: alsa/version.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: alsa/version.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: alsa/version.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: alsa/version.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: alsa/version.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: alsa/version.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: alsa/version.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: alsa/version.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for alsa/version.h" >&5
-echo $ECHO_N "checking for alsa/version.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_alsa_version_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_alsa_version_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_alsa_version_h" >&5
-echo "${ECHO_T}$ac_cv_header_alsa_version_h" >&6; }
-
-fi
-if test $ac_cv_header_alsa_version_h = yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
+if test "x$ac_cv_header_alsa_version_h" = x""yes; then :
ac_pa_use_alsa=1
LIBS="$LIBS -lasound"
@@ -10530,18 +5211,18 @@ else
fi
- { echo "$as_me:$LINENO: result: Checking sound device backend... unix" >&5
-echo "${ECHO_T}Checking sound device backend... unix" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
+$as_echo "Checking sound device backend... unix" >&6; }
ac_pa_use_oss=1
# Check whether --enable-oss was given.
-if test "${enable_oss+set}" = set; then
+if test "${enable_oss+set}" = set; then :
enableval=$enable_oss;
if test "$enable_oss" = "no"; then
ac_pa_use_oss=0
- { echo "$as_me:$LINENO: result: Checking if OSS audio is disabled... yes" >&5
-echo "${ECHO_T}Checking if OSS audio is disabled... yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OSS audio is disabled... yes" >&5
+$as_echo "Checking if OSS audio is disabled... yes" >&6; }
fi
fi
@@ -10551,11 +5232,11 @@ fi
fi
# Check whether --enable-ext_sound was given.
-if test "${enable_ext_sound+set}" = set; then
+if test "${enable_ext_sound+set}" = set; then :
enableval=$enable_ext_sound; if test "$enable_ext_sound" = "yes"; then
ac_pjmedia_snd=external
- { echo "$as_me:$LINENO: result: Checking if external sound is set... yes" >&5
-echo "${ECHO_T}Checking if external sound is set... yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if external sound is set... yes" >&5
+$as_echo "Checking if external sound is set... yes" >&6; }
fi
fi
@@ -10563,189 +5244,177 @@ fi
# Check whether --enable-small-filter was given.
-if test "${enable_small_filter+set}" = set; then
+if test "${enable_small_filter+set}" = set; then :
enableval=$enable_small_filter; if test "$enable_small_filter" = "no"; then
ac_no_small_filter='-DPJMEDIA_HAS_SMALL_FILTER=0'
- { echo "$as_me:$LINENO: result: Checking if small filter is disabled... yes" >&5
-echo "${ECHO_T}Checking if small filter is disabled... yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... yes" >&5
+$as_echo "Checking if small filter is disabled... yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if small filter is disabled... no" >&5
-echo "${ECHO_T}Checking if small filter is disabled... no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... no" >&5
+$as_echo "Checking if small filter is disabled... no" >&6; }
fi
# Check whether --enable-large-filter was given.
-if test "${enable_large_filter+set}" = set; then
+if test "${enable_large_filter+set}" = set; then :
enableval=$enable_large_filter; if test "$enable_large_filter" = "no"; then
ac_no_large_filter='-DPJMEDIA_HAS_LARGE_FILTER=0'
- { echo "$as_me:$LINENO: result: Checking if large filter is disabled... yes" >&5
-echo "${ECHO_T}Checking if large filter is disabled... yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... yes" >&5
+$as_echo "Checking if large filter is disabled... yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if large filter is disabled... no" >&5
-echo "${ECHO_T}Checking if large filter is disabled... no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... no" >&5
+$as_echo "Checking if large filter is disabled... no" >&6; }
fi
# Check whether --enable-speex-aec was given.
-if test "${enable_speex_aec+set}" = set; then
+if test "${enable_speex_aec+set}" = set; then :
enableval=$enable_speex_aec; if test "$enable_speex_aec" = "no"; then
ac_no_speex_aec='-DPJMEDIA_HAS_SPEEX_AEC=0'
- { echo "$as_me:$LINENO: result: Checking if Speex AEC is disabled...yes" >&5
-echo "${ECHO_T}Checking if Speex AEC is disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...yes" >&5
+$as_echo "Checking if Speex AEC is disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if Speex AEC is disabled...no" >&5
-echo "${ECHO_T}Checking if Speex AEC is disabled...no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...no" >&5
+$as_echo "Checking if Speex AEC is disabled...no" >&6; }
fi
# Check whether --enable-g711-codec was given.
-if test "${enable_g711_codec+set}" = set; then
+if test "${enable_g711_codec+set}" = set; then :
enableval=$enable_g711_codec; if test "$enable_g711_codec" = "no"; then
ac_no_g711_codec=1
- cat >>confdefs.h <<\_ACEOF
-#define PJMEDIA_HAS_G711_CODEC 0
-_ACEOF
+ $as_echo "#define PJMEDIA_HAS_G711_CODEC 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if G.711 codec is disabled...yes" >&5
-echo "${ECHO_T}Checking if G.711 codec is disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...yes" >&5
+$as_echo "Checking if G.711 codec is disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if G.711 codec is disabled...no" >&5
-echo "${ECHO_T}Checking if G.711 codec is disabled...no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...no" >&5
+$as_echo "Checking if G.711 codec is disabled...no" >&6; }
fi
# Check whether --enable-l16-codec was given.
-if test "${enable_l16_codec+set}" = set; then
+if test "${enable_l16_codec+set}" = set; then :
enableval=$enable_l16_codec; if test "$enable_l16_codec" = "no"; then
ac_no_l16_codec=1
- cat >>confdefs.h <<\_ACEOF
-#define PJMEDIA_HAS_L16_CODEC 0
-_ACEOF
+ $as_echo "#define PJMEDIA_HAS_L16_CODEC 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if L16 codecs are disabled...yes" >&5
-echo "${ECHO_T}Checking if L16 codecs are disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codecs are disabled...yes" >&5
+$as_echo "Checking if L16 codecs are disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if L16 codec is disabled...no" >&5
-echo "${ECHO_T}Checking if L16 codec is disabled...no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codec is disabled...no" >&5
+$as_echo "Checking if L16 codec is disabled...no" >&6; }
fi
# Check whether --enable-gsm-codec was given.
-if test "${enable_gsm_codec+set}" = set; then
+if test "${enable_gsm_codec+set}" = set; then :
enableval=$enable_gsm_codec; if test "$enable_gsm_codec" = "no"; then
ac_no_gsm_codec=1
- cat >>confdefs.h <<\_ACEOF
-#define PJMEDIA_HAS_GSM_CODEC 0
-_ACEOF
+ $as_echo "#define PJMEDIA_HAS_GSM_CODEC 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if GSM codec is disabled...yes" >&5
-echo "${ECHO_T}Checking if GSM codec is disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...yes" >&5
+$as_echo "Checking if GSM codec is disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if GSM codec is disabled...no" >&5
-echo "${ECHO_T}Checking if GSM codec is disabled...no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...no" >&5
+$as_echo "Checking if GSM codec is disabled...no" >&6; }
fi
# Check whether --enable-g722-codec was given.
-if test "${enable_g722_codec+set}" = set; then
+if test "${enable_g722_codec+set}" = set; then :
enableval=$enable_g722_codec; if test "$enable_g722_codec" = "no"; then
ac_no_g722_codec=1
- cat >>confdefs.h <<\_ACEOF
-#define PJMEDIA_HAS_G722_CODEC 0
-_ACEOF
+ $as_echo "#define PJMEDIA_HAS_G722_CODEC 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if G.722 codec is disabled...yes" >&5
-echo "${ECHO_T}Checking if G.722 codec is disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...yes" >&5
+$as_echo "Checking if G.722 codec is disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if G.722 codec is disabled...no" >&5
-echo "${ECHO_T}Checking if G.722 codec is disabled...no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...no" >&5
+$as_echo "Checking if G.722 codec is disabled...no" >&6; }
fi
# Check whether --enable-g7221-codec was given.
-if test "${enable_g7221_codec+set}" = set; then
+if test "${enable_g7221_codec+set}" = set; then :
enableval=$enable_g7221_codec; if test "$enable_g7221_codec" = "no"; then
ac_no_g7221_codec=1
- cat >>confdefs.h <<\_ACEOF
-#define PJMEDIA_HAS_G7221_CODEC 0
-_ACEOF
+ $as_echo "#define PJMEDIA_HAS_G7221_CODEC 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if G.722.1 codec is disabled...yes" >&5
-echo "${ECHO_T}Checking if G.722.1 codec is disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...yes" >&5
+$as_echo "Checking if G.722.1 codec is disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if G.722.1 codec is disabled...no" >&5
-echo "${ECHO_T}Checking if G.722.1 codec is disabled...no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...no" >&5
+$as_echo "Checking if G.722.1 codec is disabled...no" >&6; }
fi
# Check whether --enable-speex-codec was given.
-if test "${enable_speex_codec+set}" = set; then
+if test "${enable_speex_codec+set}" = set; then :
enableval=$enable_speex_codec; if test "$enable_speex_codec" = "no"; then
ac_no_speex_codec=1
- cat >>confdefs.h <<\_ACEOF
-#define PJMEDIA_HAS_SPEEX_CODEC 0
-_ACEOF
+ $as_echo "#define PJMEDIA_HAS_SPEEX_CODEC 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if Speex codec is disabled...yes" >&5
-echo "${ECHO_T}Checking if Speex codec is disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...yes" >&5
+$as_echo "Checking if Speex codec is disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if Speex codec is disabled...no" >&5
-echo "${ECHO_T}Checking if Speex codec is disabled...no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...no" >&5
+$as_echo "Checking if Speex codec is disabled...no" >&6; }
fi
+#AC_DEFINE(ac_no_ilbc_codec, 1)
+#AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC, 0)
+#AC_MSG_RESULT([Checking if iLBC codec is disabled...yes])
+
# Check whether --enable-ilbc-codec was given.
-if test "${enable_ilbc_codec+set}" = set; then
+if test "${enable_ilbc_codec+set}" = set; then :
enableval=$enable_ilbc_codec; if test "$enable_ilbc_codec" = "no"; then
ac_no_ilbc_codec=1
- cat >>confdefs.h <<\_ACEOF
-#define PJMEDIA_HAS_ILBC_CODEC 0
-_ACEOF
+ $as_echo "#define PJMEDIA_HAS_ILBC_CODEC 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: Checking if iLBC codec is disabled...yes" >&5
-echo "${ECHO_T}Checking if iLBC codec is disabled...yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...yes" >&5
+$as_echo "Checking if iLBC codec is disabled...yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: Checking if iLBC codec is disabled...no" >&5
-echo "${ECHO_T}Checking if iLBC codec is disabled...no" >&6; }
+ ac_no_ilbc_codec=1
+ $as_echo "#define PJMEDIA_HAS_ILBC_CODEC 0" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...yes" >&5
+$as_echo "Checking if iLBC codec is disabled...yes" >&6; }
fi
# Check whether --enable-libsamplerate was given.
-if test "${enable_libsamplerate+set}" = set; then
- enableval=$enable_libsamplerate;
-{ echo "$as_me:$LINENO: checking for src_new in -lsamplerate" >&5
-echo $ECHO_N "checking for src_new in -lsamplerate... $ECHO_C" >&6; }
-if test "${ac_cv_lib_samplerate_src_new+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${enable_libsamplerate+set}" = set; then :
+ enableval=$enable_libsamplerate; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for src_new in -lsamplerate" >&5
+$as_echo_n "checking for src_new in -lsamplerate... " >&6; }
+if test "${ac_cv_lib_samplerate_src_new+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsamplerate $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -10763,39 +5432,18 @@ return src_new ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_samplerate_src_new=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_samplerate_src_new=no
+ ac_cv_lib_samplerate_src_new=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_samplerate_src_new" >&5
-echo "${ECHO_T}$ac_cv_lib_samplerate_src_new" >&6; }
-if test $ac_cv_lib_samplerate_src_new = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_samplerate_src_new" >&5
+$as_echo "$ac_cv_lib_samplerate_src_new" >&6; }
+if test "x$ac_cv_lib_samplerate_src_new" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSAMPLERATE 1
_ACEOF
@@ -10805,15 +5453,15 @@ _ACEOF
fi
else
- { echo "$as_me:$LINENO: result: Skipping libsamplerate detection" >&5
-echo "${ECHO_T}Skipping libsamplerate detection" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Skipping libsamplerate detection" >&5
+$as_echo "Skipping libsamplerate detection" >&6; }
fi
# Check whether --enable-ipp was given.
-if test "${enable_ipp+set}" = set; then
+if test "${enable_ipp+set}" = set; then :
enableval=$enable_ipp;
else
enable_ipp=no
@@ -10822,7 +5470,7 @@ fi
# Check whether --enable-ipp was given.
-if test "${enable_ipp+set}" = set; then
+if test "${enable_ipp+set}" = set; then :
enableval=$enable_ipp;
else
with_ipp=no
@@ -10831,7 +5479,7 @@ fi
# Check whether --enable-ipp-samples was given.
-if test "${enable_ipp_samples+set}" = set; then
+if test "${enable_ipp_samples+set}" = set; then :
enableval=$enable_ipp_samples;
else
with_ipp_samples=no
@@ -10840,36 +5488,30 @@ fi
if test "x$enable_ipp" != "xno"; then
- { echo "$as_me:$LINENO: checking Intel IPP location" >&5
-echo $ECHO_N "checking Intel IPP location... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP location" >&5
+$as_echo_n "checking Intel IPP location... " >&6; }
if test "x$with_ipp" != "xno" -a "x$with_ipp" != "x"; then
- { echo "$as_me:$LINENO: result: $with_ipp" >&5
-echo "${ECHO_T}$with_ipp" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ipp" >&5
+$as_echo "$with_ipp" >&6; }
IPPROOT=$with_ipp
elif test "x$IPPROOT" = "x"; then
if test -d /opt/intel/ipp; then
IPPROOT=`ls -d /opt/intel/ipp/*/* | head -1`
- { echo "$as_me:$LINENO: result: autodetected in $IPPROOT" >&5
-echo "${ECHO_T}autodetected in $IPPROOT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPROOT" >&5
+$as_echo "autodetected in $IPPROOT" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: $IPPROOT" >&5
-echo "${ECHO_T}$IPPROOT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPPROOT" >&5
+$as_echo "$IPPROOT" >&6; }
fi
if test x$IPPROOT = x; then
- { { echo "$as_me:$LINENO: error: the location is neither specified nor can be guessed. Please specify with IPPROOT env var or with --with-ipp option" >&5
-echo "$as_me: error: the location is neither specified nor can be guessed. Please specify with IPPROOT env var or with --with-ipp option" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "the location is neither specified nor can be guessed. Please specify with IPPROOT env var or with --with-ipp option" "$LINENO" 5
elif test ! -d $IPPROOT; then
- { { echo "$as_me:$LINENO: error: not found" >&5
-echo "$as_me: error: not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "not found" "$LINENO" 5
elif test ! -d $IPPROOT/include; then
- { { echo "$as_me:$LINENO: error: directory doesn't seem to be valid" >&5
-echo "$as_me: error: directory doesn't seem to be valid" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "directory doesn't seem to be valid" "$LINENO" 5
else
# IPP directory looks okay.
# Remove trailing backslash
@@ -10890,13 +5532,9 @@ echo "$as_me: error: directory doesn't seem to be valid" >&2;}
LIBS="$IPP_LIBS $LIBS"
- { echo "$as_me:$LINENO: checking Intel IPP usability" >&5
-echo $ECHO_N "checking Intel IPP usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP usability" >&5
+$as_echo_n "checking Intel IPP usability... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ippcore.h>
@@ -10908,99 +5546,69 @@ ippStaticInit();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { { echo "$as_me:$LINENO: error: failed
-See \`config.log' for more details." >&5
-echo "$as_me: error: failed
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "failed
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
CFLAGS="$SAVED_CFLAGS"
LDFLAGS="$SAVED_LDFLAGS"
LIBS="$SAVED_LIBS"
fi
- { echo "$as_me:$LINENO: checking Intel IPP samples location" >&5
-echo $ECHO_N "checking Intel IPP samples location... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP samples location" >&5
+$as_echo_n "checking Intel IPP samples location... " >&6; }
if test "x$with_ipp_samples" != "xno" -a "x$with_ipp_samples" != "x"; then
- { echo "$as_me:$LINENO: result: $with_ipp_samples" >&5
-echo "${ECHO_T}$with_ipp_samples" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ipp_samples" >&5
+$as_echo "$with_ipp_samples" >&6; }
IPPSAMPLES=$with_ipp_samples
elif test "x$IPPSAMPLES" = "x"; then
if test -d /opt/intel/ipp-samples; then
IPPSAMPLES=/opt/intel/ipp-samples
- { echo "$as_me:$LINENO: result: autodetected in $IPPSAMPLES" >&5
-echo "${ECHO_T}autodetected in $IPPSAMPLES" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPSAMPLES" >&5
+$as_echo "autodetected in $IPPSAMPLES" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: $IPPSAMPLES" >&5
-echo "${ECHO_T}$IPPSAMPLES" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPPSAMPLES" >&5
+$as_echo "$IPPSAMPLES" >&6; }
fi
if test x$IPPSAMPLES = x; then
- { { echo "$as_me:$LINENO: error: the location is neither specified nor can be guessed. Please specify with IPPSAMPLES env var or with --with-ipp-samples option" >&5
-echo "$as_me: error: the location is neither specified nor can be guessed. Please specify with IPPSAMPLES env var or with --with-ipp-samples option" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "the location is neither specified nor can be guessed. Please specify with IPPSAMPLES env var or with --with-ipp-samples option" "$LINENO" 5
elif test ! -d $IPPSAMPLES; then
- { { echo "$as_me:$LINENO: error: not found" >&5
-echo "$as_me: error: not found" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "not found" "$LINENO" 5
elif test ! -d $IPPSAMPLES/speech-codecs; then
- { { echo "$as_me:$LINENO: error: directory doesn't seem to be valid" >&5
-echo "$as_me: error: directory doesn't seem to be valid" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "directory doesn't seem to be valid" "$LINENO" 5
else
# Remove trailing backslash
IPPSAMPLES=`echo $IPPSAMPLES | sed 's/\/$//'`
# Guess the libusc.a build location
- { echo "$as_me:$LINENO: checking Intel IPP USC build location" >&5
-echo $ECHO_N "checking Intel IPP USC build location... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC build location" >&5
+$as_echo_n "checking Intel IPP USC build location... " >&6; }
IPPSAMPLESLIB=`ls -d $IPPSAMPLES/speech-codecs/bin/*gcc*/lib | head -1`
if test ! -d $IPPSAMPLESLIB; then
- { { echo "$as_me:$LINENO: error: the $IPPSAMPLES/speech-codecs/bin/*gcc*/lib directory not found. Have you built the samples?
-See \`config.log' for more details." >&5
-echo "$as_me: error: the $IPPSAMPLES/speech-codecs/bin/*gcc*/lib directory not found. Have you built the samples?
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "the $IPPSAMPLES/speech-codecs/bin/*gcc*/lib directory not found. Have you built the samples?
+See \`config.log' for more details." "$LINENO" 5; }
fi
if test ! -f $IPPSAMPLESLIB/libusc.a; then
- { { echo "$as_me:$LINENO: error: libusc.a doesn't exist in $IPPSAMPLESLIB
-See \`config.log' for more details." >&5
-echo "$as_me: error: libusc.a doesn't exist in $IPPSAMPLESLIB
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "libusc.a doesn't exist in $IPPSAMPLESLIB
+See \`config.log' for more details." "$LINENO" 5; }
fi
- { echo "$as_me:$LINENO: result: $IPPSAMPLESLIB" >&5
-echo "${ECHO_T}$IPPSAMPLESLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPPSAMPLESLIB" >&5
+$as_echo "$IPPSAMPLESLIB" >&6; }
SAVED_CFLAGS="$CFLAGS"
SAVED_LDFLAGS="$LDFLAGS"
@@ -11011,13 +5619,9 @@ echo "${ECHO_T}$IPPSAMPLESLIB" >&6; }
LDFLAGS="$LDFLAGS -L$IPPSAMPLESLIB"
LIBS="-lusc $LIBS"
- { echo "$as_me:$LINENO: checking Intel IPP USC usability" >&5
-echo $ECHO_N "checking Intel IPP USC usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC usability" >&5
+$as_echo_n "checking Intel IPP USC usability... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <usc.h>
@@ -11029,39 +5633,17 @@ extern USC_Fxns USC_G729AFP_Fxns;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { { echo "$as_me:$LINENO: error: failed
-See \`config.log' for more details." >&5
-echo "$as_me: error: failed
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "failed
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
CFLAGS="$SAVED_CFLAGS"
LDFLAGS="\$(IPP_LDFLAGS) $SAVED_LDFLAGS"
@@ -11077,171 +5659,43 @@ export IPP_CFLAGS=$IPP_CFLAGS\n\
export IPP_LDFLAGS=$IPP_LDFLAGS\n\
export IPP_LIBS=$IPP_LIBS"
else
- { echo "$as_me:$LINENO: result: Skipping Intel IPP settings (not wanted)" >&5
-echo "${ECHO_T}Skipping Intel IPP settings (not wanted)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Skipping Intel IPP settings (not wanted)" >&5
+$as_echo "Skipping Intel IPP settings (not wanted)" >&6; }
fi
# Check whether --enable-ssl was given.
-if test "${enable_ssl+set}" = set; then
+if test "${enable_ssl+set}" = set; then :
enableval=$enable_ssl;
if test "$enable_ssl" = "no"; then
ac_no_ssl=1
- { echo "$as_me:$LINENO: result: Checking if SSL support is disabled... yes" >&5
-echo "${ECHO_T}Checking if SSL support is disabled... yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if SSL support is disabled... yes" >&5
+$as_echo "Checking if SSL support is disabled... yes" >&6; }
fi
else
- { echo "$as_me:$LINENO: result: checking for OpenSSL installations.." >&5
-echo "${ECHO_T}checking for OpenSSL installations.." >&6; }
-
-
-
- if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
-echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <openssl/ssl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
-echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <openssl/ssl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OpenSSL installations.." >&5
+$as_echo "checking for OpenSSL installations.." >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_openssl_ssl_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
-fi
-if test $ac_cv_header_openssl_ssl_h = yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then :
openssl_h_present=1
fi
- { echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
-echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lssl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11259,54 +5713,29 @@ return SSL_library_init ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ssl_SSL_library_init=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ssl_SSL_library_init=no
+ ac_cv_lib_ssl_SSL_library_init=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test $ac_cv_lib_ssl_SSL_library_init = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
libssl_present=1 && LIBS="$LIBS -lssl"
fi
- { echo "$as_me:$LINENO: checking for ERR_load_BIO_strings in -lcrypto" >&5
-echo $ECHO_N "checking for ERR_load_BIO_strings in -lcrypto... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypto_ERR_load_BIO_strings+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5
+$as_echo_n "checking for ERR_load_BIO_strings in -lcrypto... " >&6; }
+if test "${ac_cv_lib_crypto_ERR_load_BIO_strings+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11324,52 +5753,29 @@ return ERR_load_BIO_strings ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_crypto_ERR_load_BIO_strings=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_crypto_ERR_load_BIO_strings=no
+ ac_cv_lib_crypto_ERR_load_BIO_strings=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
-if test $ac_cv_lib_crypto_ERR_load_BIO_strings = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
+$as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
+if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = x""yes; then :
libcrypto_present=1 && LIBS="$LIBS -lcrypto"
fi
if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
- { echo "$as_me:$LINENO: result: OpenSSL library found, SSL support enabled" >&5
-echo "${ECHO_T}OpenSSL library found, SSL support enabled" >&6; }
- cat >>confdefs.h <<\_ACEOF
-#define PJSIP_HAS_TLS_TRANSPORT 1
-_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL library found, SSL support enabled" >&5
+$as_echo "OpenSSL library found, SSL support enabled" >&6; }
+ $as_echo "#define PJSIP_HAS_TLS_TRANSPORT 1" >>confdefs.h
else
- { echo "$as_me:$LINENO: result: ** OpenSSL libraries not found, disabling SSL support **" >&5
-echo "${ECHO_T}** OpenSSL libraries not found, disabling SSL support **" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found, disabling SSL support **" >&5
+$as_echo "** OpenSSL libraries not found, disabling SSL support **" >&6; }
fi
fi
@@ -11378,94 +5784,74 @@ fi
-{ echo "$as_me:$LINENO: checking if select() needs correct nfds" >&5
-echo $ECHO_N "checking if select() needs correct nfds... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if select() needs correct nfds" >&5
+$as_echo_n "checking if select() needs correct nfds... " >&6; }
case $target in
- *rtems*) cat >>confdefs.h <<\_ACEOF
-#define PJ_SELECT_NEEDS_NFDS 1
-_ACEOF
+ *rtems*) $as_echo "#define PJ_SELECT_NEEDS_NFDS 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
;;
- *) cat >>confdefs.h <<\_ACEOF
-#define PJ_SELECT_NEEDS_NFDS 0
-_ACEOF
+ *) $as_echo "#define PJ_SELECT_NEEDS_NFDS 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: no (default)" >&5
-echo "${ECHO_T}no (default)" >&6; }
- { echo "$as_me:$LINENO: result: ** Decided that select() doesn't need correct nfds (please check)" >&5
-echo "${ECHO_T}** Decided that select() doesn't need correct nfds (please check)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
+$as_echo "no (default)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Decided that select() doesn't need correct nfds (please check)" >&5
+$as_echo "** Decided that select() doesn't need correct nfds (please check)" >&6; }
;;
esac
-{ echo "$as_me:$LINENO: checking if pj_thread_create() should enforce stack size" >&5
-echo $ECHO_N "checking if pj_thread_create() should enforce stack size... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should enforce stack size" >&5
+$as_echo_n "checking if pj_thread_create() should enforce stack size... " >&6; }
case $target in
- *rtems*) cat >>confdefs.h <<\_ACEOF
-#define PJ_THREAD_SET_STACK_SIZE 1
-_ACEOF
+ *rtems*) $as_echo "#define PJ_THREAD_SET_STACK_SIZE 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
;;
- *) cat >>confdefs.h <<\_ACEOF
-#define PJ_THREAD_SET_STACK_SIZE 0
-_ACEOF
+ *) $as_echo "#define PJ_THREAD_SET_STACK_SIZE 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: no (default)" >&5
-echo "${ECHO_T}no (default)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
+$as_echo "no (default)" >&6; }
;;
esac
-{ echo "$as_me:$LINENO: checking if pj_thread_create() should allocate stack" >&5
-echo $ECHO_N "checking if pj_thread_create() should allocate stack... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should allocate stack" >&5
+$as_echo_n "checking if pj_thread_create() should allocate stack... " >&6; }
case $target in
- *rtems*) cat >>confdefs.h <<\_ACEOF
-#define PJ_THREAD_ALLOCATE_STACK 1
-_ACEOF
+ *rtems*) $as_echo "#define PJ_THREAD_ALLOCATE_STACK 1" >>confdefs.h
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
;;
- *) cat >>confdefs.h <<\_ACEOF
-#define PJ_THREAD_ALLOCATE_STACK 0
-_ACEOF
+ *) $as_echo "#define PJ_THREAD_ALLOCATE_STACK 0" >>confdefs.h
- { echo "$as_me:$LINENO: result: no (default)" >&5
-echo "${ECHO_T}no (default)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
+$as_echo "no (default)" >&6; }
;;
esac
case $target in
*mingw* | *cygw* | *win32* | *w32* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_BLOCKING_ERROR_VAL WSAEWOULDBLOCK
-_ACEOF
+ $as_echo "#define PJ_BLOCKING_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h
;;
- *) cat >>confdefs.h <<\_ACEOF
-#define PJ_BLOCKING_ERROR_VAL EAGAIN
-_ACEOF
+ *) $as_echo "#define PJ_BLOCKING_ERROR_VAL EAGAIN" >>confdefs.h
- { echo "$as_me:$LINENO: result: ** Setting non-blocking recv() retval to EAGAIN (please check)" >&5
-echo "${ECHO_T}** Setting non-blocking recv() retval to EAGAIN (please check)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking recv() retval to EAGAIN (please check)" >&5
+$as_echo "** Setting non-blocking recv() retval to EAGAIN (please check)" >&6; }
;;
esac
case $target in
*mingw* | *cygw* | *win32* | *w32* )
- cat >>confdefs.h <<\_ACEOF
-#define PJ_BLOCKING_CONNECT_ERROR_VAL WSAEWOULDBLOCK
-_ACEOF
+ $as_echo "#define PJ_BLOCKING_CONNECT_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h
;;
- *) cat >>confdefs.h <<\_ACEOF
-#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS
-_ACEOF
+ *) $as_echo "#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS" >>confdefs.h
- { echo "$as_me:$LINENO: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&5
-echo "${ECHO_T}** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&5
+$as_echo "** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&6; }
;;
esac
@@ -11520,12 +5906,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -11533,8 +5920,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -11557,12 +5944,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -11578,11 +5965,11 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -11590,12 +5977,15 @@ LTLIBOBJS=$ac_ltlibobjs
+
: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -11605,59 +5995,79 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -11666,20 +6076,18 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -11690,32 +6098,111 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
-done
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
-# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -11729,13 +6216,17 @@ else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -11750,104 +6241,103 @@ echo X/"$0" |
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -11864,12 +6354,12 @@ else
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
- case $1 in
- -*)set "./$1";;
+ case $1 in #(
+ -*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -11884,13 +6374,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by pjproject $as_me 1.0, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -11903,29 +6399,40 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -11933,26 +6440,26 @@ $config_files
Configuration headers:
$config_headers
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
pjproject config.status 1.0
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.64,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
@@ -11974,34 +6481,38 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
+ as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -12016,30 +6527,32 @@ if $ac_cs_silent; then
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -12059,9 +6572,7 @@ do
"third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;;
"third_party/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -12087,7 +6598,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
@@ -12098,156 +6609,140 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
-_ACEOF
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-ac_pjdir!$ac_pjdir$ac_delim
-ac_build_mak_vars!$ac_build_mak_vars$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-ac_os_objs!$ac_os_objs$ac_delim
-ac_pjmedia_snd!$ac_pjmedia_snd$ac_delim
-ac_pa_cflags!$ac_pa_cflags$ac_delim
-ac_pa_use_alsa!$ac_pa_use_alsa$ac_delim
-ac_pa_use_oss!$ac_pa_use_oss$ac_delim
-ac_no_small_filter!$ac_no_small_filter$ac_delim
-ac_no_large_filter!$ac_no_large_filter$ac_delim
-ac_no_speex_aec!$ac_no_speex_aec$ac_delim
-ac_no_g711_codec!$ac_no_g711_codec$ac_delim
-ac_no_l16_codec!$ac_no_l16_codec$ac_delim
-ac_no_gsm_codec!$ac_no_gsm_codec$ac_delim
-ac_no_g722_codec!$ac_no_g722_codec$ac_delim
-ac_no_g7221_codec!$ac_no_g7221_codec$ac_delim
-ac_no_speex_codec!$ac_no_speex_codec$ac_delim
-ac_no_ilbc_codec!$ac_no_ilbc_codec$ac_delim
-ac_no_ssl!$ac_no_ssl$ac_delim
-openssl_h_present!$openssl_h_present$ac_delim
-libssl_present!$libssl_present$ac_delim
-libcrypto_present!$libcrypto_present$ac_delim
-ac_cross_compile!$ac_cross_compile$ac_delim
-ac_linux_poll!$ac_linux_poll$ac_delim
-ac_host!$ac_host$ac_delim
-ac_main_obj!$ac_main_obj$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+ . ./conf$$subs.sh ||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -12263,20 +6758,128 @@ s/^[^=]*=[ ]*$//
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[ ]*#[ ]*define[ ][ ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
+shift
+for ac_tag
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
- { (exit 1); exit 1; }; };;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -12304,26 +6907,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -12333,42 +6944,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -12386,20 +6962,15 @@ echo X"$as_dir" |
q
}
s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -12435,12 +7006,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
p
q
}
@@ -12448,36 +7019,37 @@ case `sed -n '/datarootdir/ {
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -12486,119 +7058,48 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
# CONFIG_HEADER
#
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status. If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless. But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-ac_dB='\\)[ (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
- sed -n '
- t rset
- :rset
- s/^[ ]*#[ ]*define[ ][ ]*//
- t ok
- d
- :ok
- s/[\\&,]/\\&/g
- s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
- s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
- ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[ #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-b
-:def
-_ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
- echo "/* $configure_input */"
- cat "$ac_result"
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error "could not create -" "$LINENO" 5
fi
- rm -f "$tmp/out12"
;;
@@ -12607,11 +7108,13 @@ echo "$as_me: $ac_file is unchanged" >&6;}
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -12631,12 +7134,16 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-{ echo "$as_me:$LINENO: result:
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h.
@@ -12646,7 +7153,7 @@ Further customizations can be put in:
The next step now is to run 'make dep' and 'make'.
" >&5
-echo "${ECHO_T}
+$as_echo "
Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h.
diff --git a/sflphone-common/libs/pjproject/aconfigure.ac b/sflphone-common/libs/pjproject/aconfigure.ac
index 2d56e6a54e1afffbdd9bb028fe6b15fc6a64e34e..b8b7914f25ff93c29dc68d3179dee808dd1fb98c 100644
--- a/sflphone-common/libs/pjproject/aconfigure.ac
+++ b/sflphone-common/libs/pjproject/aconfigure.ac
@@ -559,6 +559,10 @@ AC_ARG_ENABLE(speex-codec,
dnl # Include iLBC codec
AC_SUBST(ac_no_ilbc_codec)
+#AC_DEFINE(ac_no_ilbc_codec, 1)
+#AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC, 0)
+#AC_MSG_RESULT([Checking if iLBC codec is disabled...yes])
+
AC_ARG_ENABLE(ilbc-codec,
AC_HELP_STRING([--disable-ilbc-codec],
[Exclude iLBC codec in the build]),
@@ -567,7 +571,9 @@ AC_ARG_ENABLE(ilbc-codec,
AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0)
AC_MSG_RESULT([Checking if iLBC codec is disabled...yes])
fi],
- AC_MSG_RESULT([Checking if iLBC codec is disabled...no]))
+ [ac_no_ilbc_codec=1]
+ AC_DEFINE(PJMEDIA_HAS_ILBC_CODEC,0)
+ AC_MSG_RESULT([Checking if iLBC codec is disabled...yes]))
dnl # Include libsamplerate
AC_ARG_ENABLE(libsamplerate,
diff --git a/sflphone-common/libs/pjproject/third_party/build/Makefile b/sflphone-common/libs/pjproject/third_party/build/Makefile
index 36d80612076f25e3761cfe4f45c6f3aae3489499..6d84db662cdb58d574db54b9cfc287e6941192b2 100644
--- a/sflphone-common/libs/pjproject/third_party/build/Makefile
+++ b/sflphone-common/libs/pjproject/third_party/build/Makefile
@@ -1,4 +1,4 @@
-DIRS = resample milenage srtp
+DIRS = resample srtp
include ../../build.mak
include $(PJDIR)/build/common.mak
diff --git a/sflphone-common/libs/pjproject/third_party/build/milenage/Makefile b/sflphone-common/libs/pjproject/third_party/build/milenage/Makefile
deleted file mode 100644
index 094ddeaa7e42e8763816d5e3ae84f8fa21c18cef..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/build/milenage/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-include ../../../build.mak
-include ../../../build/common.mak
-
-export LIBDIR := ../../lib
-
-RULES_MAK := $(PJDIR)/build/rules.mak
-
-export MILENAGE_LIB := ../../lib/libmilenage-$(TARGET_NAME)$(LIBEXT)
-
-###############################################################################
-# Gather all flags.
-#
-export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
- $(CFLAGS) $(CC_INC). $(CC_INC)../../milenage/include \
- $(CC_INC)../../../pjlib/include
-export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
- $(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
- $(LDFLAGS)
-
-export MILENAGE_SRCDIR = ../../milenage
-export MILENAGE_OBJS = milenage.o rijndael.o
-export MILENAGE_CFLAGS = $(_CFLAGS)
-
-
-export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
-###############################################################################
-# Main entry
-#
-# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
-#
-TARGETS := libmilenage
-
-all: $(TARGETS)
-
-doc:
- cd .. && doxygen docs/doxygen.cfg
-
-dep: depend
-distclean: realclean
-
-.PHONY: dep depend libmilenage clean realclean distclean
-
-libmilenage:
- $(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $(MILENAGE_LIB)
-
-clean print_lib:
- $(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $@
-
-realclean:
- $(subst @@,$(subst /,$(HOST_PSEP),.ilbc-$(TARGET_NAME).depend),$(HOST_RMR))
-
- $(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $@
-
-depend:
- $(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $@
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.dsp b/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.dsp
deleted file mode 100644
index cf89612e9c3f6c83c0a7c3f0ebfe95d35de406c2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.dsp
+++ /dev/null
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libmilenage" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libmilenage - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libmilenage.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libmilenage.mak" CFG="libmilenage - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libmilenage - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libmilenage - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libmilenage - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "../../lib"
-# PROP BASE Intermediate_Dir "output/libmilenage-i386-win32-vc6-release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../lib"
-# PROP Intermediate_Dir "output/libmilenage-i386-win32-vc6-release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../pjlib/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../lib/libmilenage-i386-win32-vc6-release.lib"
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "output/libmilenage-i386-win32-vc6-debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../lib"
-# PROP Intermediate_Dir "output/libmilenage-i386-win32-vc6-debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"../../lib/libmilenage-i386-win32-vc6-debug.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "libmilenage - Win32 Release"
-# Name "libmilenage - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\milenage\milenage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\milenage\rijndael.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\milenage\milenage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\milenage\rijndael.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.vcp b/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.vcp
deleted file mode 100644
index 34f4d037397414d746c23ed2f9497ae1dd608e1c..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.vcp
+++ /dev/null
@@ -1,1562 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="libmilenage" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE x86) Static Library" 0x8304
-# TARGTYPE "Win32 (WCE MIPS16) Static Library" 0x8904
-# TARGTYPE "Win32 (WCE SH4) Static Library" 0x8604
-# TARGTYPE "Win32 (WCE MIPSII) Static Library" 0xa104
-# TARGTYPE "Win32 (WCE MIPSIV_FP) Static Library" 0x9204
-# TARGTYPE "Win32 (WCE SH3) Static Library" 0x8104
-# TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304
-# TARGTYPE "Win32 (WCE ARMV4I) Static Library" 0xa504
-# TARGTYPE "Win32 (WCE emulator) Static Library" 0xa604
-# TARGTYPE "Win32 (WCE MIPSII_FP) Static Library" 0xa204
-# TARGTYPE "Win32 (WCE ARMV4T) Static Library" 0xa404
-# TARGTYPE "Win32 (WCE MIPSIV) Static Library" 0x9604
-
-CFG=libmilenage - Win32 (WCE MIPSII_FP) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libmilenage.vcn".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libmilenage.vcn" CFG="libmilenage - Win32 (WCE MIPSII_FP) Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libmilenage - Win32 (WCE MIPSII_FP) Release" (based on "Win32 (WCE MIPSII_FP) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPSII_FP) Debug" (based on "Win32 (WCE MIPSII_FP) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPSII) Release" (based on "Win32 (WCE MIPSII) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPSII) Debug" (based on "Win32 (WCE MIPSII) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPSIV) Release" (based on "Win32 (WCE MIPSIV) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPSIV) Debug" (based on "Win32 (WCE MIPSIV) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE ARMV4I) Release" (based on "Win32 (WCE ARMV4I) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE ARMV4I) Debug" (based on "Win32 (WCE ARMV4I) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPSIV_FP) Release" (based on "Win32 (WCE MIPSIV_FP) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPSIV_FP) Debug" (based on "Win32 (WCE MIPSIV_FP) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPS16) Release" (based on "Win32 (WCE MIPS16) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE MIPS16) Debug" (based on "Win32 (WCE MIPS16) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE ARMV4T) Release" (based on "Win32 (WCE ARMV4T) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE ARMV4T) Debug" (based on "Win32 (WCE ARMV4T) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE "libmilenage - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-
-!IF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII_FP) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\MIPSII_FPRel"
-# PROP BASE Intermediate_Dir "output\MIPSII_FPRel"
-# PROP BASE CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\MIPSII_FPRel"
-# PROP Intermediate_Dir "output\MIPSII_FPRel"
-# PROP CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips2 /QMFPE- /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips2 /QMFPE- /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII_FP) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\MIPSII_FPDbg"
-# PROP BASE Intermediate_Dir "output\MIPSII_FPDbg"
-# PROP BASE CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\MIPSII_FPDbg"
-# PROP Intermediate_Dir "output\MIPSII_FPDbg"
-# PROP CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips2 /QMFPE- /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips2 /QMFPE- /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\MIPSIIRel"
-# PROP BASE Intermediate_Dir "output\MIPSIIRel"
-# PROP BASE CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\MIPSIIRel"
-# PROP Intermediate_Dir "output\MIPSIIRel"
-# PROP CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips2 /QMFPE /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips2 /QMFPE /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\MIPSIIDbg"
-# PROP BASE Intermediate_Dir "output\MIPSIIDbg"
-# PROP BASE CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\MIPSIIDbg"
-# PROP Intermediate_Dir "output\MIPSIIDbg"
-# PROP CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips2 /QMFPE /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips2 /QMFPE /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\SH4Rel"
-# PROP BASE Intermediate_Dir "output\SH4Rel"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\SH4Rel"
-# PROP Intermediate_Dir "output\SH4Rel"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Qsh4 /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /Qsh4 /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\SH4Dbg"
-# PROP BASE Intermediate_Dir "output\SH4Dbg"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\SH4Dbg"
-# PROP Intermediate_Dir "output\SH4Dbg"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Qsh4 /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Qsh4 /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH3) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\SH3Rel"
-# PROP BASE Intermediate_Dir "output\SH3Rel"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\SH3Rel"
-# PROP Intermediate_Dir "output\SH3Rel"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH3) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\SH3Dbg"
-# PROP BASE Intermediate_Dir "output\SH3Dbg"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\SH3Dbg"
-# PROP Intermediate_Dir "output\SH3Dbg"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\MIPSIVRel"
-# PROP BASE Intermediate_Dir "output\MIPSIVRel"
-# PROP BASE CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\MIPSIVRel"
-# PROP Intermediate_Dir "output\MIPSIVRel"
-# PROP CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\MIPSIVDbg"
-# PROP BASE Intermediate_Dir "output\MIPSIVDbg"
-# PROP BASE CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\MIPSIVDbg"
-# PROP Intermediate_Dir "output\MIPSIVDbg"
-# PROP CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE emulator) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\emulatorRel"
-# PROP BASE Intermediate_Dir "output\emulatorRel"
-# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\emulatorRel"
-# PROP Intermediate_Dir "output\emulatorRel"
-# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE emulator) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\emulatorDbg"
-# PROP BASE Intermediate_Dir "output\emulatorDbg"
-# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\emulatorDbg"
-# PROP Intermediate_Dir "output\emulatorDbg"
-# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4I) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\ARMV4IRel"
-# PROP BASE Intermediate_Dir "output\ARMV4IRel"
-# PROP BASE CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\ARMV4IRel"
-# PROP Intermediate_Dir "output\ARMV4IRel"
-# PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4I) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\ARMV4IDbg"
-# PROP BASE Intermediate_Dir "output\ARMV4IDbg"
-# PROP BASE CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\ARMV4IDbg"
-# PROP Intermediate_Dir "output\ARMV4IDbg"
-# PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV_FP) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\MIPSIV_FPRel"
-# PROP BASE Intermediate_Dir "output\MIPSIV_FPRel"
-# PROP BASE CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\MIPSIV_FPRel"
-# PROP Intermediate_Dir "output\MIPSIV_FPRel"
-# PROP CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE- /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE- /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV_FP) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\MIPSIV_FPDbg"
-# PROP BASE Intermediate_Dir "output\MIPSIV_FPDbg"
-# PROP BASE CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\MIPSIV_FPDbg"
-# PROP Intermediate_Dir "output\MIPSIV_FPDbg"
-# PROP CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE- /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QMmips4 /QMn32 /QMFPE- /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\ARMV4Rel"
-# PROP BASE Intermediate_Dir "output\ARMV4Rel"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\ARMV4Rel"
-# PROP Intermediate_Dir "output\ARMV4Rel"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\ARMV4Dbg"
-# PROP BASE Intermediate_Dir "output\ARMV4Dbg"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\ARMV4Dbg"
-# PROP Intermediate_Dir "output\ARMV4Dbg"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPS16) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\MIPS16Rel"
-# PROP BASE Intermediate_Dir "output\MIPS16Rel"
-# PROP BASE CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\MIPS16Rel"
-# PROP Intermediate_Dir "output\MIPS16Rel"
-# PROP CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_MIPS16_" /D "MIPS16SUPPORT" /D "_LIB" /YX /QMmips16 /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_MIPS16_" /D "MIPS16SUPPORT" /D "_LIB" /YX /QMmips16 /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPS16) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\MIPS16Dbg"
-# PROP BASE Intermediate_Dir "output\MIPS16Dbg"
-# PROP BASE CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\MIPS16Dbg"
-# PROP Intermediate_Dir "output\MIPS16Dbg"
-# PROP CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_MIPS16_" /D "MIPS16SUPPORT" /D "_LIB" /YX /QMmips16 /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_MIPS16_" /D "MIPS16SUPPORT" /D "_LIB" /YX /QMmips16 /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4T) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\ARMV4TRel"
-# PROP BASE Intermediate_Dir "output\ARMV4TRel"
-# PROP BASE CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\ARMV4TRel"
-# PROP Intermediate_Dir "output\ARMV4TRel"
-# PROP CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clthumb.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_LIB" /YX /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4T) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\ARMV4TDbg"
-# PROP BASE Intermediate_Dir "output\ARMV4TDbg"
-# PROP BASE CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\ARMV4TDbg"
-# PROP Intermediate_Dir "output\ARMV4TDbg"
-# PROP CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=clthumb.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE x86) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\X86Rel"
-# PROP BASE Intermediate_Dir "output\X86Rel"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\X86Rel"
-# PROP Intermediate_Dir "output\X86Rel"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /I "../../../pjlib/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE x86) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\X86Dbg"
-# PROP BASE Intermediate_Dir "output\X86Dbg"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir "output\"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\X86Dbg"
-# PROP Intermediate_Dir "output\X86Dbg"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir "output\"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjlib/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "libmilenage - Win32 (WCE MIPSII_FP) Release"
-# Name "libmilenage - Win32 (WCE MIPSII_FP) Debug"
-# Name "libmilenage - Win32 (WCE MIPSII) Release"
-# Name "libmilenage - Win32 (WCE MIPSII) Debug"
-# Name "libmilenage - Win32 (WCE SH4) Release"
-# Name "libmilenage - Win32 (WCE SH4) Debug"
-# Name "libmilenage - Win32 (WCE SH3) Release"
-# Name "libmilenage - Win32 (WCE SH3) Debug"
-# Name "libmilenage - Win32 (WCE MIPSIV) Release"
-# Name "libmilenage - Win32 (WCE MIPSIV) Debug"
-# Name "libmilenage - Win32 (WCE emulator) Release"
-# Name "libmilenage - Win32 (WCE emulator) Debug"
-# Name "libmilenage - Win32 (WCE ARMV4I) Release"
-# Name "libmilenage - Win32 (WCE ARMV4I) Debug"
-# Name "libmilenage - Win32 (WCE MIPSIV_FP) Release"
-# Name "libmilenage - Win32 (WCE MIPSIV_FP) Debug"
-# Name "libmilenage - Win32 (WCE ARMV4) Release"
-# Name "libmilenage - Win32 (WCE ARMV4) Debug"
-# Name "libmilenage - Win32 (WCE MIPS16) Release"
-# Name "libmilenage - Win32 (WCE MIPS16) Debug"
-# Name "libmilenage - Win32 (WCE ARMV4T) Release"
-# Name "libmilenage - Win32 (WCE ARMV4T) Debug"
-# Name "libmilenage - Win32 (WCE x86) Release"
-# Name "libmilenage - Win32 (WCE x86) Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\milenage\milenage.c
-
-!IF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII_FP) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII_FP) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH4) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH4) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH3) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH3) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE emulator) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE emulator) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4I) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4I) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV_FP) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV_FP) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPS16) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPS16) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4T) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4T) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE x86) Release"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE x86) Debug"
-
-DEP_CPP_MILEN=\
- "..\..\milenage\milenage.h"\
- "..\..\milenage\rijndael.h"\
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\milenage\rijndael.c
-
-!IF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII_FP) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII_FP) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSII) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH4) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH4) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH3) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE SH3) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE emulator) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE emulator) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4I) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4I) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV_FP) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPSIV_FP) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPS16) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE MIPS16) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4T) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE ARMV4T) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE x86) Release"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ELSEIF "$(CFG)" == "libmilenage - Win32 (WCE x86) Debug"
-
-DEP_CPP_RIJND=\
- "..\..\..\pjlib\include\pj\compat\cc_armcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_codew.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_gcce.h"\
- "..\..\..\pjlib\include\pj\compat\cc_msvc.h"\
- "..\..\..\pjlib\include\pj\compat\cc_mwcc.h"\
- "..\..\..\pjlib\include\pj\compat\m_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_auto.h"\
- "..\..\..\pjlib\include\pj\compat\os_darwinos.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux.h"\
- "..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\
- "..\..\..\pjlib\include\pj\compat\os_palmos.h"\
- "..\..\..\pjlib\include\pj\compat\os_rtems.h"\
- "..\..\..\pjlib\include\pj\compat\os_sunos.h"\
- "..\..\..\pjlib\include\pj\compat\os_symbian.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32.h"\
- "..\..\..\pjlib\include\pj\compat\os_win32_wince.h"\
- "..\..\..\pjlib\include\pj\compat\size_t.h"\
- "..\..\..\pjlib\include\pj\config.h"\
- "..\..\..\pjlib\include\pj\config_site.h"\
- "..\..\..\pjlib\include\pj\config_site_sample.h"\
- "..\..\..\pjlib\include\pj\types.h"\
-
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\milenage\milenage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\milenage\rijndael.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.vcproj b/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.vcproj
deleted file mode 100644
index c0f63e5a7eb003bfde97fbfae012478c9818d51f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/build/milenage/libmilenage.vcproj
+++ /dev/null
@@ -1,2888 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libmilenage"
- ProjectGUID="{4BF51C21-5A30-423B-82FE-1ED410E5769D}"
- RootNamespace="libmilenage"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="Windows Mobile 6 Standard SDK (ARMV4I)"
- />
- <Platform
- Name="Windows Mobile 6 Professional SDK (ARMV4I)"
- />
- <Platform
- Name="Pocket PC 2003 (ARMV4)"
- />
- <Platform
- Name="Smartphone 2003 (ARMV4)"
- />
- <Platform
- Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- />
- <Platform
- Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- ConfigurationType="4"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- ConfigurationType="4"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Win32"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- ConfigurationType="4"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Win32"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- ConfigurationType="4"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Win32"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- ConfigurationType="4"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Win32"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- ConfigurationType="4"
- UseOfMFC="0"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Pocket PC 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Pocket PC 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Pocket PC 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Smartphone 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Smartphone 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Smartphone 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Smartphone 2003 (ARMV4)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- <Configuration
- Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- ConfigurationType="4"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_LIB;"
- ExecutionBucket="7"
- AdditionalIncludeDirectories="../../../pjlib/include"
- PrecompiledHeaderFile=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCCodeSignTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\milenage\milenage.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\milenage\rijndael.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug-Dynamic|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release-Static|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\milenage\milenage.h"
- >
- </File>
- <File
- RelativePath="..\..\milenage\rijndael.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/FrameClassify.c b/sflphone-common/libs/pjproject/third_party/ilbc/FrameClassify.c
deleted file mode 100644
index 80d72d917d51b3bc30e22e54eb4f544d7ada33e5..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/FrameClassify.c
+++ /dev/null
@@ -1,114 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- FrameClassify.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include "iLBC_define.h"
-
- /*---------------------------------------------------------------*
- * Classification of subframes to localize start state
- *--------------------------------------------------------------*/
-
- int FrameClassify( /* index to the max-energy sub-frame */
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i/o) the encoder state structure */
- float *residual /* (i) lpc residual signal */
- ) {
- float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp;
- int n, l, max_ssqEn_n;
- const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9,
- (float)1.0,(float)0.9,(float)0.8};
- const float sampEn_win[5]={(float)1.0/(float)6.0,
- (float)2.0/(float)6.0, (float)3.0/(float)6.0,
- (float)4.0/(float)6.0, (float)5.0/(float)6.0};
-
- /* init the front and back energies to zero */
-
- memset(fssqEn, 0, NSUB_MAX*sizeof(float));
- memset(bssqEn, 0, NSUB_MAX*sizeof(float));
-
- /* Calculate front of first seqence */
-
- n=0;
- pp=residual;
- for (l=0; l<5; l++) {
- fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
- pp++;
- }
- for (l=5; l<SUBL; l++) {
-
-
-
-
-
- fssqEn[n] += (*pp) * (*pp);
- pp++;
- }
-
- /* Calculate front and back of all middle sequences */
-
- for (n=1; n<iLBCenc_inst->nsub-1; n++) {
- pp=residual+n*SUBL;
- for (l=0; l<5; l++) {
- fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
- bssqEn[n] += (*pp) * (*pp);
- pp++;
- }
- for (l=5; l<SUBL-5; l++) {
- fssqEn[n] += (*pp) * (*pp);
- bssqEn[n] += (*pp) * (*pp);
- pp++;
- }
- for (l=SUBL-5; l<SUBL; l++) {
- fssqEn[n] += (*pp) * (*pp);
- bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
- pp++;
- }
- }
-
- /* Calculate back of last seqence */
-
- n=iLBCenc_inst->nsub-1;
- pp=residual+n*SUBL;
- for (l=0; l<SUBL-5; l++) {
- bssqEn[n] += (*pp) * (*pp);
- pp++;
- }
- for (l=SUBL-5; l<SUBL; l++) {
- bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
- pp++;
- }
-
- /* find the index to the weighted 80 sample with
- most energy */
-
- if (iLBCenc_inst->mode==20) l=1;
- else l=0;
-
- max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l];
- max_ssqEn_n=1;
- for (n=2; n<iLBCenc_inst->nsub; n++) {
-
-
-
-
-
-
- l++;
- if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) {
- max_ssqEn=(fssqEn[n-1]+bssqEn[n]) *
- ssqEn_win[l];
- max_ssqEn_n=n;
- }
- }
-
- return max_ssqEn_n;
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/FrameClassify.h b/sflphone-common/libs/pjproject/third_party/ilbc/FrameClassify.h
deleted file mode 100644
index 018ddbe5daec5c2a7b9670e2cc1de2140b0e5cbe..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/FrameClassify.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- FrameClassify.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_FRAMECLASSIFY_H
- #define __iLBC_FRAMECLASSIFY_H
-
- int FrameClassify( /* index to the max-energy sub-frame */
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i/o) the encoder state structure */
- float *residual /* (i) lpc residual signal */
- );
-
-
-
-
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.c b/sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.c
deleted file mode 100644
index 81bab90485c7f201aeb34df64ed26703a907b195..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.c
+++ /dev/null
@@ -1,158 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- LPC_decode.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <string.h>
-
- #include "helpfun.h"
- #include "lsf.h"
- #include "iLBC_define.h"
- #include "constants.h"
-
- /*---------------------------------------------------------------*
- * interpolation of lsf coefficients for the decoder
- *--------------------------------------------------------------*/
-
- void LSFinterpolate2a_dec(
- float *a, /* (o) lpc coefficients for a sub-frame */
- float *lsf1, /* (i) first lsf coefficient vector */
- float *lsf2, /* (i) second lsf coefficient vector */
- float coef, /* (i) interpolation weight */
- int length /* (i) length of lsf vectors */
- ){
- float lsftmp[LPC_FILTERORDER];
-
- interpolate(lsftmp, lsf1, lsf2, coef, length);
- lsf2a(a, lsftmp);
- }
-
- /*---------------------------------------------------------------*
- * obtain dequantized lsf coefficients from quantization index
- *--------------------------------------------------------------*/
-
- void SimplelsfDEQ(
- float *lsfdeq, /* (o) dequantized lsf coefficients */
- int *index, /* (i) quantization index */
- int lpc_n /* (i) number of LPCs */
- ){
- int i, j, pos, cb_pos;
-
-
-
-
-
- /* decode first LSF */
-
- pos = 0;
- cb_pos = 0;
- for (i = 0; i < LSF_NSPLIT; i++) {
- for (j = 0; j < dim_lsfCbTbl[i]; j++) {
- lsfdeq[pos + j] = lsfCbTbl[cb_pos +
- (long)(index[i])*dim_lsfCbTbl[i] + j];
- }
- pos += dim_lsfCbTbl[i];
- cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
- }
-
- if (lpc_n>1) {
-
- /* decode last LSF */
-
- pos = 0;
- cb_pos = 0;
- for (i = 0; i < LSF_NSPLIT; i++) {
- for (j = 0; j < dim_lsfCbTbl[i]; j++) {
- lsfdeq[LPC_FILTERORDER + pos + j] =
- lsfCbTbl[cb_pos +
- (long)(index[LSF_NSPLIT + i])*
- dim_lsfCbTbl[i] + j];
- }
- pos += dim_lsfCbTbl[i];
- cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * obtain synthesis and weighting filters form lsf coefficients
- *---------------------------------------------------------------*/
-
- void DecoderInterpolateLSF(
- float *syntdenum, /* (o) synthesis filter coefficients */
- float *weightdenum, /* (o) weighting denumerator
- coefficients */
- float *lsfdeq, /* (i) dequantized lsf coefficients */
- int length, /* (i) length of lsf coefficient vector */
- iLBC_Dec_Inst_t *iLBCdec_inst
- /* (i) the decoder state structure */
- ){
- int i, pos, lp_length;
- float lp[LPC_FILTERORDER + 1], *lsfdeq2;
-
-
-
-
-
-
- lsfdeq2 = lsfdeq + length;
- lp_length = length + 1;
-
- if (iLBCdec_inst->mode==30) {
- /* sub-frame 1: Interpolation between old and first */
-
- LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq,
- lsf_weightTbl_30ms[0], length);
- memcpy(syntdenum,lp,lp_length*sizeof(float));
- bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM,
- lp_length);
-
- /* sub-frames 2 to 6: interpolation between first
- and last LSF */
-
- pos = lp_length;
- for (i = 1; i < 6; i++) {
- LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2,
- lsf_weightTbl_30ms[i], length);
- memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
- bwexpand(weightdenum + pos, lp,
- LPC_CHIRP_WEIGHTDENUM, lp_length);
- pos += lp_length;
- }
- }
- else {
- pos = 0;
- for (i = 0; i < iLBCdec_inst->nsub; i++) {
- LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold,
- lsfdeq, lsf_weightTbl_20ms[i], length);
- memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
- bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM,
- lp_length);
- pos += lp_length;
- }
- }
-
- /* update memory */
-
- if (iLBCdec_inst->mode==30)
- memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2,
- length*sizeof(float));
- else
- memcpy(iLBCdec_inst->lsfdeqold, lsfdeq,
- length*sizeof(float));
-
- }
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.h b/sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.h
deleted file mode 100644
index abe1d7b3b1db0521daf95abbd4e9bbec2b06fe52..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- LPC_decode.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_LPC_DECODE_H
- #define __iLBC_LPC_DECODE_H
-
- void LSFinterpolate2a_dec(
- float *a, /* (o) lpc coefficients for a sub-frame */
- float *lsf1, /* (i) first lsf coefficient vector */
- float *lsf2, /* (i) second lsf coefficient vector */
- float coef, /* (i) interpolation weight */
- int length /* (i) length of lsf vectors */
- );
-
- void SimplelsfDEQ(
- float *lsfdeq, /* (o) dequantized lsf coefficients */
- int *index, /* (i) quantization index */
- int lpc_n /* (i) number of LPCs */
- );
-
- void DecoderInterpolateLSF(
- float *syntdenum, /* (o) synthesis filter coefficients */
- float *weightdenum, /* (o) weighting denumerator
- coefficients */
- float *lsfdeq, /* (i) dequantized lsf coefficients */
- int length, /* (i) length of lsf coefficient vector */
- iLBC_Dec_Inst_t *iLBCdec_inst
- /* (i) the decoder state structure */
- );
-
- #endif
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.c b/sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.c
deleted file mode 100644
index 19695c0fa552eece2761a4d9edd8b37abe10bd9f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.c
+++ /dev/null
@@ -1,241 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- LPCencode.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <string.h>
-
- #include "iLBC_define.h"
- #include "helpfun.h"
- #include "lsf.h"
- #include "constants.h"
-
-
-
-
-
- /*----------------------------------------------------------------*
- * lpc analysis (subrutine to LPCencode)
- *---------------------------------------------------------------*/
-
- void SimpleAnalysis(
- float *lsf, /* (o) lsf coefficients */
- float *data, /* (i) new data vector */
- iLBC_Enc_Inst_t *iLBCenc_inst
- /* (i/o) the encoder state structure */
- ){
- int k, is;
- float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1];
- float lp2[LPC_FILTERORDER + 1];
- float r[LPC_FILTERORDER + 1];
-
- is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
- memcpy(iLBCenc_inst->lpc_buffer+is,data,
- iLBCenc_inst->blockl*sizeof(float));
-
- /* No lookahead, last window is asymmetric */
-
- for (k = 0; k < iLBCenc_inst->lpc_n; k++) {
-
- is = LPC_LOOKBACK;
-
- if (k < (iLBCenc_inst->lpc_n - 1)) {
- window(temp, lpc_winTbl,
- iLBCenc_inst->lpc_buffer, BLOCKL_MAX);
- } else {
- window(temp, lpc_asymwinTbl,
- iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX);
- }
-
- autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER);
- window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
-
- levdurb(lp, temp, r, LPC_FILTERORDER);
- bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);
-
- a2lsf(lsf + k*LPC_FILTERORDER, lp2);
- }
- is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
- memmove(iLBCenc_inst->lpc_buffer,
- iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is,
- is*sizeof(float));
- }
-
- /*----------------------------------------------------------------*
-
-
-
-
-
- * lsf interpolator and conversion from lsf to a coefficients
- * (subrutine to SimpleInterpolateLSF)
- *---------------------------------------------------------------*/
-
- void LSFinterpolate2a_enc(
- float *a, /* (o) lpc coefficients */
- float *lsf1,/* (i) first set of lsf coefficients */
- float *lsf2,/* (i) second set of lsf coefficients */
- float coef, /* (i) weighting coefficient to use between
- lsf1 and lsf2 */
- long length /* (i) length of coefficient vectors */
- ){
- float lsftmp[LPC_FILTERORDER];
-
- interpolate(lsftmp, lsf1, lsf2, coef, length);
- lsf2a(a, lsftmp);
- }
-
- /*----------------------------------------------------------------*
- * lsf interpolator (subrutine to LPCencode)
- *---------------------------------------------------------------*/
-
- void SimpleInterpolateLSF(
- float *syntdenum, /* (o) the synthesis filter denominator
- resulting from the quantized
- interpolated lsf */
- float *weightdenum, /* (o) the weighting filter denominator
- resulting from the unquantized
- interpolated lsf */
- float *lsf, /* (i) the unquantized lsf coefficients */
- float *lsfdeq, /* (i) the dequantized lsf coefficients */
- float *lsfold, /* (i) the unquantized lsf coefficients of
- the previous signal frame */
- float *lsfdeqold, /* (i) the dequantized lsf coefficients of
- the previous signal frame */
- int length, /* (i) should equate LPC_FILTERORDER */
- iLBC_Enc_Inst_t *iLBCenc_inst
- /* (i/o) the encoder state structure */
- ){
- int i, pos, lp_length;
- float lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2;
-
- lsf2 = lsf + length;
- lsfdeq2 = lsfdeq + length;
- lp_length = length + 1;
-
- if (iLBCenc_inst->mode==30) {
- /* sub-frame 1: Interpolation between old and first
-
-
-
-
-
- set of lsf coefficients */
-
- LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
- lsf_weightTbl_30ms[0], length);
- memcpy(syntdenum,lp,lp_length*sizeof(float));
- LSFinterpolate2a_enc(lp, lsfold, lsf,
- lsf_weightTbl_30ms[0], length);
- bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length);
-
- /* sub-frame 2 to 6: Interpolation between first
- and second set of lsf coefficients */
-
- pos = lp_length;
- for (i = 1; i < iLBCenc_inst->nsub; i++) {
- LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2,
- lsf_weightTbl_30ms[i], length);
- memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
-
- LSFinterpolate2a_enc(lp, lsf, lsf2,
- lsf_weightTbl_30ms[i], length);
- bwexpand(weightdenum + pos, lp,
- LPC_CHIRP_WEIGHTDENUM, lp_length);
- pos += lp_length;
- }
- }
- else {
- pos = 0;
- for (i = 0; i < iLBCenc_inst->nsub; i++) {
- LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq,
- lsf_weightTbl_20ms[i], length);
- memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
- LSFinterpolate2a_enc(lp, lsfold, lsf,
- lsf_weightTbl_20ms[i], length);
- bwexpand(weightdenum+pos, lp,
- LPC_CHIRP_WEIGHTDENUM, lp_length);
- pos += lp_length;
- }
- }
-
- /* update memory */
-
- if (iLBCenc_inst->mode==30) {
- memcpy(lsfold, lsf2, length*sizeof(float));
- memcpy(lsfdeqold, lsfdeq2, length*sizeof(float));
- }
- else {
- memcpy(lsfold, lsf, length*sizeof(float));
- memcpy(lsfdeqold, lsfdeq, length*sizeof(float));
-
-
-
-
-
- }
- }
-
- /*----------------------------------------------------------------*
- * lsf quantizer (subrutine to LPCencode)
- *---------------------------------------------------------------*/
-
- void SimplelsfQ(
- float *lsfdeq, /* (o) dequantized lsf coefficients
- (dimension FILTERORDER) */
- int *index, /* (o) quantization index */
- float *lsf, /* (i) the lsf coefficient vector to be
- quantized (dimension FILTERORDER ) */
- int lpc_n /* (i) number of lsf sets to quantize */
- ){
- /* Quantize first LSF with memoryless split VQ */
- SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT,
- dim_lsfCbTbl, size_lsfCbTbl);
-
- if (lpc_n==2) {
- /* Quantize second LSF with memoryless split VQ */
- SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT,
- lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT,
- dim_lsfCbTbl, size_lsfCbTbl);
- }
- }
-
- /*----------------------------------------------------------------*
- * lpc encoder
- *---------------------------------------------------------------*/
-
- void LPCencode(
- float *syntdenum, /* (i/o) synthesis filter coefficients
- before/after encoding */
- float *weightdenum, /* (i/o) weighting denumerator
- coefficients before/after
- encoding */
- int *lsf_index, /* (o) lsf quantization index */
- float *data, /* (i) lsf coefficients to quantize */
- iLBC_Enc_Inst_t *iLBCenc_inst
- /* (i/o) the encoder state structure */
- ){
- float lsf[LPC_FILTERORDER * LPC_N_MAX];
- float lsfdeq[LPC_FILTERORDER * LPC_N_MAX];
- int change=0;
-
- SimpleAnalysis(lsf, data, iLBCenc_inst);
- SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n);
-
-
-
-
-
- change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n);
- SimpleInterpolateLSF(syntdenum, weightdenum,
- lsf, lsfdeq, iLBCenc_inst->lsfold,
- iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst);
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.h b/sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.h
deleted file mode 100644
index 39a9b04037f6e9a3195d1ebc41a7f5bb1bbb16a9..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- LPCencode.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_LPCENCOD_H
- #define __iLBC_LPCENCOD_H
-
- void LPCencode(
- float *syntdenum, /* (i/o) synthesis filter coefficients
- before/after encoding */
- float *weightdenum, /* (i/o) weighting denumerator coefficients
- before/after encoding */
- int *lsf_index, /* (o) lsf quantization index */
- float *data, /* (i) lsf coefficients to quantize */
- iLBC_Enc_Inst_t *iLBCenc_inst
- /* (i/o) the encoder state structure */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/StateConstructW.c b/sflphone-common/libs/pjproject/third_party/ilbc/StateConstructW.c
deleted file mode 100644
index 1d3e65fa634e6562cf9d75800fafa24383874858..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/StateConstructW.c
+++ /dev/null
@@ -1,86 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- StateConstructW.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <string.h>
-
- #include "iLBC_define.h"
- #include "constants.h"
- #include "filter.h"
-
- /*----------------------------------------------------------------*
- * decoding of the start state
- *---------------------------------------------------------------*/
-
- void StateConstructW(
- int idxForMax, /* (i) 6-bit index for the quantization of
- max amplitude */
- int *idxVec, /* (i) vector of quantization indexes */
- float *syntDenum, /* (i) synthesis filter denumerator */
-
-
-
-
-
- float *out, /* (o) the decoded state vector */
- int len /* (i) length of a state vector */
- ){
- float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp,
- numerator[LPC_FILTERORDER+1];
- float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout;
- int k,tmpi;
-
- /* decoding of the maximum value */
-
- maxVal = state_frgqTbl[idxForMax];
- maxVal = (float)pow(10,maxVal)/(float)4.5;
-
- /* initialization of buffers and coefficients */
-
- memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
- memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
- for (k=0; k<LPC_FILTERORDER; k++) {
- numerator[k]=syntDenum[LPC_FILTERORDER-k];
- }
- numerator[LPC_FILTERORDER]=syntDenum[0];
- tmp = &tmpbuf[LPC_FILTERORDER];
- fout = &foutbuf[LPC_FILTERORDER];
-
- /* decoding of the sample values */
-
- for (k=0; k<len; k++) {
- tmpi = len-1-k;
- /* maxVal = 1/scal */
- tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]];
- }
-
- /* circular convolution with all-pass filter */
-
- memset(tmp+len, 0, len*sizeof(float));
- ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
- LPC_FILTERORDER, fout);
- for (k=0;k<len;k++) {
- out[k] = fout[len-1-k]+fout[2*len-1-k];
- }
- }
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/StateConstructW.h b/sflphone-common/libs/pjproject/third_party/ilbc/StateConstructW.h
deleted file mode 100644
index 08f93d2815bebc9d54654f238c3c569d957f4b90..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/StateConstructW.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- StateConstructW.h
-
-
-
-
-
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_STATECONSTRUCTW_H
- #define __iLBC_STATECONSTRUCTW_H
-
- void StateConstructW(
- int idxForMax, /* (i) 6-bit index for the quantization of
- max amplitude */
- int *idxVec, /* (i) vector of quantization indexes */
- float *syntDenum, /* (i) synthesis filter denumerator */
- float *out, /* (o) the decoded state vector */
- int len /* (i) length of a state vector */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/StateSearchW.c b/sflphone-common/libs/pjproject/third_party/ilbc/StateSearchW.c
deleted file mode 100644
index 1eeee936c1321ec7605c04e369ed1485a801e5d1..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/StateSearchW.c
+++ /dev/null
@@ -1,211 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- StateSearchW.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <string.h>
-
- #include "iLBC_define.h"
- #include "constants.h"
- #include "filter.h"
- #include "helpfun.h"
-
- /*----------------------------------------------------------------*
- * predictive noise shaping encoding of scaled start state
- * (subrutine for StateSearchW)
- *---------------------------------------------------------------*/
-
- void AbsQuantW(
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i) Encoder instance */
- float *in, /* (i) vector to encode */
- float *syntDenum, /* (i) denominator of synthesis filter */
- float *weightDenum, /* (i) denominator of weighting filter */
- int *out, /* (o) vector of quantizer indexes */
- int len, /* (i) length of vector to encode and
- vector of quantizer indexes */
- int state_first /* (i) position of start state in the
- 80 vec */
- ){
- float *syntOut;
- float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS];
- float toQ, xq;
- int n;
- int index;
-
- /* initialization of buffer for filtering */
-
- memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float));
-
-
-
-
-
-
- /* initialization of pointer for filtering */
-
- syntOut = &syntOutBuf[LPC_FILTERORDER];
-
- /* synthesis and weighting filters on input */
-
- if (state_first) {
- AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER);
- } else {
- AllPoleFilter (in, weightDenum,
- iLBCenc_inst->state_short_len-SUBL,
- LPC_FILTERORDER);
- }
-
- /* encoding loop */
-
- for (n=0; n<len; n++) {
-
- /* time update of filter coefficients */
-
- if ((state_first)&&(n==SUBL)){
- syntDenum += (LPC_FILTERORDER+1);
- weightDenum += (LPC_FILTERORDER+1);
-
- /* synthesis and weighting filters on input */
- AllPoleFilter (&in[n], weightDenum, len-n,
- LPC_FILTERORDER);
-
- } else if ((state_first==0)&&
- (n==(iLBCenc_inst->state_short_len-SUBL))) {
- syntDenum += (LPC_FILTERORDER+1);
- weightDenum += (LPC_FILTERORDER+1);
-
- /* synthesis and weighting filters on input */
- AllPoleFilter (&in[n], weightDenum, len-n,
- LPC_FILTERORDER);
-
- }
-
- /* prediction of synthesized and weighted input */
-
- syntOut[n] = 0.0;
- AllPoleFilter (&syntOut[n], weightDenum, 1,
- LPC_FILTERORDER);
-
- /* quantization */
-
- toQ = in[n]-syntOut[n];
-
-
-
-
-
- sort_sq(&xq, &index, toQ, state_sq3Tbl, 8);
- out[n]=index;
- syntOut[n] = state_sq3Tbl[out[n]];
-
- /* update of the prediction filter */
-
- AllPoleFilter(&syntOut[n], weightDenum, 1,
- LPC_FILTERORDER);
- }
- }
-
- /*----------------------------------------------------------------*
- * encoding of start state
- *---------------------------------------------------------------*/
-
- void StateSearchW(
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i) Encoder instance */
- float *residual,/* (i) target residual vector */
- float *syntDenum, /* (i) lpc synthesis filter */
- float *weightDenum, /* (i) weighting filter denuminator */
- int *idxForMax, /* (o) quantizer index for maximum
- amplitude */
- int *idxVec, /* (o) vector of quantization indexes */
- int len, /* (i) length of all vectors */
- int state_first /* (i) position of start state in the
- 80 vec */
- ){
- float dtmp, maxVal;
- float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS];
- float *tmp, numerator[1+LPC_FILTERORDER];
- float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout;
- int k;
- float qmax, scal;
-
- /* initialization of buffers and filter coefficients */
-
- memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
- memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
- for (k=0; k<LPC_FILTERORDER; k++) {
- numerator[k]=syntDenum[LPC_FILTERORDER-k];
- }
- numerator[LPC_FILTERORDER]=syntDenum[0];
- tmp = &tmpbuf[LPC_FILTERORDER];
- fout = &foutbuf[LPC_FILTERORDER];
-
- /* circular convolution with the all-pass filter */
-
-
-
-
-
-
- memcpy(tmp, residual, len*sizeof(float));
- memset(tmp+len, 0, len*sizeof(float));
- ZeroPoleFilter(tmp, numerator, syntDenum, 2*len,
- LPC_FILTERORDER, fout);
- for (k=0; k<len; k++) {
- fout[k] += fout[k+len];
- }
-
- /* identification of the maximum amplitude value */
-
- maxVal = fout[0];
- for (k=1; k<len; k++) {
-
- if (fout[k]*fout[k] > maxVal*maxVal){
- maxVal = fout[k];
- }
- }
- maxVal=(float)fabs(maxVal);
-
- /* encoding of the maximum amplitude value */
-
- if (maxVal < 10.0) {
- maxVal = 10.0;
- }
- maxVal = (float)log10(maxVal);
- sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64);
-
- /* decoding of the maximum amplitude representation value,
- and corresponding scaling of start state */
-
- maxVal=state_frgqTbl[*idxForMax];
- qmax = (float)pow(10,maxVal);
- scal = (float)(4.5)/qmax;
- for (k=0; k<len; k++){
- fout[k] *= scal;
- }
-
- /* predictive noise shaping encoding of scaled start state */
-
- AbsQuantW(iLBCenc_inst, fout,syntDenum,
- weightDenum,idxVec, len, state_first);
- }
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/StateSearchW.h b/sflphone-common/libs/pjproject/third_party/ilbc/StateSearchW.h
deleted file mode 100644
index 9036daa892e80c0b1fddccd6b085dabf2e0f674b..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/StateSearchW.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- StateSearchW.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_STATESEARCHW_H
- #define __iLBC_STATESEARCHW_H
-
- void AbsQuantW(
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i) Encoder instance */
- float *in, /* (i) vector to encode */
- float *syntDenum, /* (i) denominator of synthesis filter */
- float *weightDenum, /* (i) denominator of weighting filter */
- int *out, /* (o) vector of quantizer indexes */
- int len, /* (i) length of vector to encode and
- vector of quantizer indexes */
- int state_first /* (i) position of start state in the
- 80 vec */
- );
-
- void StateSearchW(
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i) Encoder instance */
- float *residual,/* (i) target residual vector */
- float *syntDenum, /* (i) lpc synthesis filter */
- float *weightDenum, /* (i) weighting filter denuminator */
- int *idxForMax, /* (o) quantizer index for maximum
- amplitude */
- int *idxVec, /* (o) vector of quantization indexes */
- int len, /* (i) length of all vectors */
- int state_first /* (i) position of start state in the
- 80 vec */
- );
-
-
- #endif
-
-
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/anaFilter.c b/sflphone-common/libs/pjproject/third_party/ilbc/anaFilter.c
deleted file mode 100644
index c161f98a5bf78702c9d7b64a784a6f06c2df7ade..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/anaFilter.c
+++ /dev/null
@@ -1,72 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- anaFilter.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <string.h>
- #include "iLBC_define.h"
-
- /*----------------------------------------------------------------*
- * LP analysis filter.
- *---------------------------------------------------------------*/
-
- void anaFilter(
- float *In, /* (i) Signal to be filtered */
- float *a, /* (i) LP parameters */
- int len,/* (i) Length of signal */
- float *Out, /* (o) Filtered signal */
- float *mem /* (i/o) Filter state */
- ){
- int i, j;
- float *po, *pi, *pm, *pa;
-
- po = Out;
-
- /* Filter first part using memory from past */
-
- for (i=0; i<LPC_FILTERORDER; i++) {
- pi = &In[i];
- pm = &mem[LPC_FILTERORDER-1];
- pa = a;
- *po=0.0;
-
-
-
-
-
- for (j=0; j<=i; j++) {
- *po+=(*pa++)*(*pi--);
- }
- for (j=i+1; j<LPC_FILTERORDER+1; j++) {
-
- *po+=(*pa++)*(*pm--);
- }
- po++;
- }
-
- /* Filter last part where the state is entirely
- in the input vector */
-
- for (i=LPC_FILTERORDER; i<len; i++) {
- pi = &In[i];
- pa = a;
- *po=0.0;
- for (j=0; j<LPC_FILTERORDER+1; j++) {
- *po+=(*pa++)*(*pi--);
- }
- po++;
- }
-
- /* Update state vector */
-
- memcpy(mem, &In[len-LPC_FILTERORDER],
- LPC_FILTERORDER*sizeof(float));
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/anaFilter.h b/sflphone-common/libs/pjproject/third_party/ilbc/anaFilter.h
deleted file mode 100644
index 91367f95e04513d38e37e8e9b87e89340d342081..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/anaFilter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- anaFilter.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_ANAFILTER_H
- #define __iLBC_ANAFILTER_H
-
- void anaFilter(
-
-
-
-
-
- float *In, /* (i) Signal to be filtered */
- float *a, /* (i) LP parameters */
- int len,/* (i) Length of signal */
- float *Out, /* (o) Filtered signal */
- float *mem /* (i/o) Filter state */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/constants.c b/sflphone-common/libs/pjproject/third_party/ilbc/constants.c
deleted file mode 100644
index d43dac4d4e5a825d223c761307a74f758467d61b..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/constants.c
+++ /dev/null
@@ -1,770 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- constants.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include "iLBC_define.h"
-
- /* ULP bit allocation */
-
- /* 20 ms frame */
-
- const iLBC_ULP_Inst_t ULP_20msTbl = {
- /* LSF */
- { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
- {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
- /* Start state location, gain and samples */
- {2,0,0,0,0},
- {1,0,0,0,0},
- {6,0,0,0,0},
- {0,1,2,0,0},
- /* extra CB index and extra CB gain */
- {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
- {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
- /* CB index and CB gain */
- { {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
- {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
- {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
- {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}},
- { {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
- {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
- {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
- {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}
- };
-
- /* 30 ms frame */
-
- const iLBC_ULP_Inst_t ULP_30msTbl = {
- /* LSF */
-
-
-
-
-
- { {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0},
- {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}},
- /* Start state location, gain and samples */
- {3,0,0,0,0},
- {1,0,0,0,0},
- {6,0,0,0,0},
- {0,1,2,0,0},
- /* extra CB index and extra CB gain */
- {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
- {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
- /* CB index and CB gain */
- { {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
- {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
- {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
- {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}},
- { {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}},
- {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
- {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}},
- {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}}
- };
-
- /* HP Filters */
-
- float hpi_zero_coefsTbl[3] = {
- (float)0.92727436, (float)-1.8544941, (float)0.92727436
- };
- float hpi_pole_coefsTbl[3] = {
- (float)1.0, (float)-1.9059465, (float)0.9114024
- };
- float hpo_zero_coefsTbl[3] = {
- (float)0.93980581, (float)-1.8795834, (float)0.93980581
- };
- float hpo_pole_coefsTbl[3] = {
- (float)1.0, (float)-1.9330735, (float)0.93589199
- };
-
- /* LP Filter */
-
- float lpFilt_coefsTbl[FILTERORDER_DS]={
- (float)-0.066650, (float)0.125000, (float)0.316650,
- (float)0.414063, (float)0.316650,
- (float)0.125000, (float)-0.066650
- };
-
- /* State quantization tables */
-
- float state_sq3Tbl[8] = {
- (float)-3.719849, (float)-2.177490, (float)-1.130005,
-
-
-
-
-
- (float)-0.309692, (float)0.444214, (float)1.329712,
- (float)2.436279, (float)3.983887
- };
-
- float state_frgqTbl[64] = {
- (float)1.000085, (float)1.071695, (float)1.140395,
- (float)1.206868, (float)1.277188, (float)1.351503,
- (float)1.429380, (float)1.500727, (float)1.569049,
- (float)1.639599, (float)1.707071, (float)1.781531,
- (float)1.840799, (float)1.901550, (float)1.956695,
- (float)2.006750, (float)2.055474, (float)2.102787,
- (float)2.142819, (float)2.183592, (float)2.217962,
- (float)2.257177, (float)2.295739, (float)2.332967,
- (float)2.369248, (float)2.402792, (float)2.435080,
- (float)2.468598, (float)2.503394, (float)2.539284,
- (float)2.572944, (float)2.605036, (float)2.636331,
- (float)2.668939, (float)2.698780, (float)2.729101,
- (float)2.759786, (float)2.789834, (float)2.818679,
- (float)2.848074, (float)2.877470, (float)2.906899,
- (float)2.936655, (float)2.967804, (float)3.000115,
- (float)3.033367, (float)3.066355, (float)3.104231,
- (float)3.141499, (float)3.183012, (float)3.222952,
- (float)3.265433, (float)3.308441, (float)3.350823,
- (float)3.395275, (float)3.442793, (float)3.490801,
- (float)3.542514, (float)3.604064, (float)3.666050,
- (float)3.740994, (float)3.830749, (float)3.938770,
- (float)4.101764
- };
-
- /* CB tables */
-
- int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44},
- {108,108,108}, {108,108,108}, {108,108,108}};
- int stMemLTbl=85;
- int memLfTbl[NASUB_MAX]={147,147,147,147};
-
- /* expansion filter(s) */
-
- float cbfiltersTbl[CB_FILTERLEN]={
- (float)-0.034180, (float)0.108887, (float)-0.184326,
- (float)0.806152, (float)0.713379, (float)-0.144043,
- (float)0.083740, (float)-0.033691
- };
-
- /* Gain Quantization */
-
- float gain_sq3Tbl[8]={
- (float)-1.000000, (float)-0.659973, (float)-0.330017,
-
-
-
-
-
- (float)0.000000, (float)0.250000, (float)0.500000,
- (float)0.750000, (float)1.00000};
-
- float gain_sq4Tbl[16]={
- (float)-1.049988, (float)-0.900024, (float)-0.750000,
- (float)-0.599976, (float)-0.450012, (float)-0.299988,
- (float)-0.150024, (float)0.000000, (float)0.150024,
- (float)0.299988, (float)0.450012, (float)0.599976,
- (float)0.750000, (float)0.900024, (float)1.049988,
- (float)1.200012};
-
- float gain_sq5Tbl[32]={
- (float)0.037476, (float)0.075012, (float)0.112488,
- (float)0.150024, (float)0.187500, (float)0.224976,
- (float)0.262512, (float)0.299988, (float)0.337524,
- (float)0.375000, (float)0.412476, (float)0.450012,
- (float)0.487488, (float)0.525024, (float)0.562500,
- (float)0.599976, (float)0.637512, (float)0.674988,
- (float)0.712524, (float)0.750000, (float)0.787476,
- (float)0.825012, (float)0.862488, (float)0.900024,
- (float)0.937500, (float)0.974976, (float)1.012512,
- (float)1.049988, (float)1.087524, (float)1.125000,
- (float)1.162476, (float)1.200012};
-
- /* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */
- float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={
- (float)0.000000, (float)0.000000, (float)0.000000,
- (float)1.000000,
- (float)0.000000, (float)0.000000, (float)0.000000,
- (float)0.015625, (float)-0.076904, (float)0.288330,
- (float)0.862061,
- (float)-0.106445, (float)0.018799, (float)-0.015625,
- (float)0.023682, (float)-0.124268, (float)0.601563,
- (float)0.601563,
- (float)-0.124268, (float)0.023682, (float)-0.023682,
- (float)0.018799, (float)-0.106445, (float)0.862061,
- (float)0.288330,
- (float)-0.076904, (float)0.015625, (float)-0.018799};
-
- float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0,
- (float)200.0, (float)280.0, (float)360.0,
- (float)440.0, (float)520.0, (float)600.0};
-
- /* LPC analysis and quantization */
-
- int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4};
- int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
-
-
-
-
-
-
- float lsfmeanTbl[LPC_FILTERORDER] = {
- (float)0.281738, (float)0.445801, (float)0.663330,
- (float)0.962524, (float)1.251831, (float)1.533081,
- (float)1.850586, (float)2.137817, (float)2.481445,
- (float)2.777344};
-
- float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0,
- (float)(2.0/3.0),
- (float)(1.0/3.0), (float)0.0, (float)0.0};
-
- float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0),
- (float)(1.0/4.0), (float)(0.0)};
-
- /* Hanning LPC window */
- float lpc_winTbl[BLOCKL_MAX]={
- (float)0.000183, (float)0.000671, (float)0.001526,
- (float)0.002716, (float)0.004242, (float)0.006104,
- (float)0.008301, (float)0.010834, (float)0.013702,
- (float)0.016907, (float)0.020416, (float)0.024261,
- (float)0.028442, (float)0.032928, (float)0.037750,
- (float)0.042877, (float)0.048309, (float)0.054047,
- (float)0.060089, (float)0.066437, (float)0.073090,
- (float)0.080017, (float)0.087219, (float)0.094727,
- (float)0.102509, (float)0.110535, (float)0.118835,
- (float)0.127411, (float)0.136230, (float)0.145294,
- (float)0.154602, (float)0.164154, (float)0.173920,
- (float)0.183899, (float)0.194122, (float)0.204529,
- (float)0.215149, (float)0.225952, (float)0.236938,
- (float)0.248108, (float)0.259460, (float)0.270966,
- (float)0.282654, (float)0.294464, (float)0.306396,
- (float)0.318481, (float)0.330688, (float)0.343018,
- (float)0.355438, (float)0.367981, (float)0.380585,
- (float)0.393280, (float)0.406067, (float)0.418884,
- (float)0.431763, (float)0.444702, (float)0.457672,
- (float)0.470673, (float)0.483704, (float)0.496735,
- (float)0.509766, (float)0.522797, (float)0.535828,
- (float)0.548798, (float)0.561768, (float)0.574677,
- (float)0.587524, (float)0.600342, (float)0.613068,
- (float)0.625732, (float)0.638306, (float)0.650787,
- (float)0.663147, (float)0.675415, (float)0.687561,
- (float)0.699585, (float)0.711487, (float)0.723206,
- (float)0.734802, (float)0.746216, (float)0.757477,
- (float)0.768585, (float)0.779480, (float)0.790192,
- (float)0.800720, (float)0.811005, (float)0.821106,
- (float)0.830994, (float)0.840668, (float)0.850067,
- (float)0.859253, (float)0.868225, (float)0.876892,
- (float)0.885345, (float)0.893524, (float)0.901428,
- (float)0.909058, (float)0.916412, (float)0.923492,
-
-
-
-
-
- (float)0.930267, (float)0.936768, (float)0.942963,
- (float)0.948853, (float)0.954437, (float)0.959717,
- (float)0.964691, (float)0.969360, (float)0.973694,
- (float)0.977692, (float)0.981384, (float)0.984741,
- (float)0.987762, (float)0.990479, (float)0.992828,
- (float)0.994873, (float)0.996552, (float)0.997925,
- (float)0.998932, (float)0.999603, (float)0.999969,
- (float)0.999969, (float)0.999603, (float)0.998932,
- (float)0.997925, (float)0.996552, (float)0.994873,
- (float)0.992828, (float)0.990479, (float)0.987762,
- (float)0.984741, (float)0.981384, (float)0.977692,
- (float)0.973694, (float)0.969360, (float)0.964691,
- (float)0.959717, (float)0.954437, (float)0.948853,
- (float)0.942963, (float)0.936768, (float)0.930267,
- (float)0.923492, (float)0.916412, (float)0.909058,
- (float)0.901428, (float)0.893524, (float)0.885345,
- (float)0.876892, (float)0.868225, (float)0.859253,
- (float)0.850067, (float)0.840668, (float)0.830994,
- (float)0.821106, (float)0.811005, (float)0.800720,
- (float)0.790192, (float)0.779480, (float)0.768585,
- (float)0.757477, (float)0.746216, (float)0.734802,
- (float)0.723206, (float)0.711487, (float)0.699585,
- (float)0.687561, (float)0.675415, (float)0.663147,
- (float)0.650787, (float)0.638306, (float)0.625732,
- (float)0.613068, (float)0.600342, (float)0.587524,
- (float)0.574677, (float)0.561768, (float)0.548798,
- (float)0.535828, (float)0.522797, (float)0.509766,
- (float)0.496735, (float)0.483704, (float)0.470673,
- (float)0.457672, (float)0.444702, (float)0.431763,
- (float)0.418884, (float)0.406067, (float)0.393280,
- (float)0.380585, (float)0.367981, (float)0.355438,
- (float)0.343018, (float)0.330688, (float)0.318481,
- (float)0.306396, (float)0.294464, (float)0.282654,
- (float)0.270966, (float)0.259460, (float)0.248108,
- (float)0.236938, (float)0.225952, (float)0.215149,
- (float)0.204529, (float)0.194122, (float)0.183899,
- (float)0.173920, (float)0.164154, (float)0.154602,
- (float)0.145294, (float)0.136230, (float)0.127411,
- (float)0.118835, (float)0.110535, (float)0.102509,
- (float)0.094727, (float)0.087219, (float)0.080017,
- (float)0.073090, (float)0.066437, (float)0.060089,
- (float)0.054047, (float)0.048309, (float)0.042877,
- (float)0.037750, (float)0.032928, (float)0.028442,
- (float)0.024261, (float)0.020416, (float)0.016907,
- (float)0.013702, (float)0.010834, (float)0.008301,
- (float)0.006104, (float)0.004242, (float)0.002716,
- (float)0.001526, (float)0.000671, (float)0.000183
- };
-
-
-
-
-
- /* Asymmetric LPC window */
- float lpc_asymwinTbl[BLOCKL_MAX]={
- (float)0.000061, (float)0.000214, (float)0.000458,
- (float)0.000824, (float)0.001282, (float)0.001831,
- (float)0.002472, (float)0.003235, (float)0.004120,
- (float)0.005066, (float)0.006134, (float)0.007294,
- (float)0.008545, (float)0.009918, (float)0.011383,
- (float)0.012939, (float)0.014587, (float)0.016357,
- (float)0.018219, (float)0.020172, (float)0.022217,
- (float)0.024353, (float)0.026611, (float)0.028961,
- (float)0.031372, (float)0.033905, (float)0.036530,
- (float)0.039276, (float)0.042084, (float)0.044983,
- (float)0.047974, (float)0.051086, (float)0.054260,
- (float)0.057526, (float)0.060883, (float)0.064331,
- (float)0.067871, (float)0.071503, (float)0.075226,
- (float)0.079010, (float)0.082916, (float)0.086884,
- (float)0.090942, (float)0.095062, (float)0.099304,
- (float)0.103607, (float)0.107971, (float)0.112427,
- (float)0.116974, (float)0.121582, (float)0.126282,
- (float)0.131073, (float)0.135895, (float)0.140839,
- (float)0.145813, (float)0.150879, (float)0.156006,
- (float)0.161224, (float)0.166504, (float)0.171844,
- (float)0.177246, (float)0.182709, (float)0.188263,
- (float)0.193848, (float)0.199524, (float)0.205231,
- (float)0.211029, (float)0.216858, (float)0.222778,
- (float)0.228729, (float)0.234741, (float)0.240814,
- (float)0.246918, (float)0.253082, (float)0.259308,
- (float)0.265564, (float)0.271881, (float)0.278259,
- (float)0.284668, (float)0.291107, (float)0.297607,
- (float)0.304138, (float)0.310730, (float)0.317322,
- (float)0.323975, (float)0.330658, (float)0.337372,
- (float)0.344147, (float)0.350922, (float)0.357727,
- (float)0.364594, (float)0.371460, (float)0.378357,
- (float)0.385284, (float)0.392212, (float)0.399170,
- (float)0.406158, (float)0.413177, (float)0.420197,
- (float)0.427246, (float)0.434296, (float)0.441376,
- (float)0.448456, (float)0.455536, (float)0.462646,
- (float)0.469757, (float)0.476868, (float)0.483978,
- (float)0.491089, (float)0.498230, (float)0.505341,
- (float)0.512451, (float)0.519592, (float)0.526703,
- (float)0.533813, (float)0.540924, (float)0.548004,
- (float)0.555084, (float)0.562164, (float)0.569244,
- (float)0.576294, (float)0.583313, (float)0.590332,
- (float)0.597321, (float)0.604309, (float)0.611267,
- (float)0.618195, (float)0.625092, (float)0.631989,
- (float)0.638855, (float)0.645660, (float)0.652466,
- (float)0.659241, (float)0.665985, (float)0.672668,
- (float)0.679352, (float)0.685974, (float)0.692566,
-
-
-
-
-
- (float)0.699127, (float)0.705658, (float)0.712128,
- (float)0.718536, (float)0.724945, (float)0.731262,
- (float)0.737549, (float)0.743805, (float)0.750000,
- (float)0.756134, (float)0.762238, (float)0.768280,
- (float)0.774261, (float)0.780182, (float)0.786072,
- (float)0.791870, (float)0.797638, (float)0.803314,
- (float)0.808960, (float)0.814514, (float)0.820038,
- (float)0.825470, (float)0.830841, (float)0.836151,
- (float)0.841400, (float)0.846558, (float)0.851654,
- (float)0.856689, (float)0.861633, (float)0.866516,
- (float)0.871338, (float)0.876068, (float)0.880737,
- (float)0.885315, (float)0.889801, (float)0.894226,
- (float)0.898560, (float)0.902832, (float)0.907013,
- (float)0.911102, (float)0.915100, (float)0.919037,
- (float)0.922882, (float)0.926636, (float)0.930328,
- (float)0.933899, (float)0.937408, (float)0.940796,
- (float)0.944122, (float)0.947357, (float)0.950470,
- (float)0.953522, (float)0.956482, (float)0.959351,
- (float)0.962097, (float)0.964783, (float)0.967377,
- (float)0.969849, (float)0.972229, (float)0.974518,
- (float)0.976715, (float)0.978821, (float)0.980835,
- (float)0.982727, (float)0.984528, (float)0.986237,
- (float)0.987854, (float)0.989380, (float)0.990784,
- (float)0.992096, (float)0.993317, (float)0.994415,
- (float)0.995422, (float)0.996338, (float)0.997162,
- (float)0.997864, (float)0.998474, (float)0.998962,
- (float)0.999390, (float)0.999695, (float)0.999878,
- (float)0.999969, (float)0.999969, (float)0.996918,
- (float)0.987701, (float)0.972382, (float)0.951050,
- (float)0.923889, (float)0.891022, (float)0.852631,
- (float)0.809021, (float)0.760406, (float)0.707092,
- (float)0.649445, (float)0.587799, (float)0.522491,
- (float)0.453979, (float)0.382690, (float)0.309021,
- (float)0.233459, (float)0.156433, (float)0.078461
- };
-
- /* Lag window for LPC */
- float lpc_lagwinTbl[LPC_FILTERORDER + 1]={
- (float)1.000100, (float)0.998890, (float)0.995569,
- (float)0.990057, (float)0.982392,
- (float)0.972623, (float)0.960816, (float)0.947047,
- (float)0.931405, (float)0.913989, (float)0.894909};
-
- /* LSF quantization*/
- float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = {
- (float)0.155396, (float)0.273193, (float)0.451172,
- (float)0.390503, (float)0.648071, (float)1.002075,
- (float)0.440186, (float)0.692261, (float)0.955688,
-
-
-
-
-
- (float)0.343628, (float)0.642334, (float)1.071533,
- (float)0.318359, (float)0.491577, (float)0.670532,
- (float)0.193115, (float)0.375488, (float)0.725708,
- (float)0.364136, (float)0.510376, (float)0.658691,
- (float)0.297485, (float)0.527588, (float)0.842529,
- (float)0.227173, (float)0.365967, (float)0.563110,
- (float)0.244995, (float)0.396729, (float)0.636475,
- (float)0.169434, (float)0.300171, (float)0.520264,
- (float)0.312866, (float)0.464478, (float)0.643188,
- (float)0.248535, (float)0.429932, (float)0.626099,
- (float)0.236206, (float)0.491333, (float)0.817139,
- (float)0.334961, (float)0.625122, (float)0.895752,
- (float)0.343018, (float)0.518555, (float)0.698608,
- (float)0.372803, (float)0.659790, (float)0.945435,
- (float)0.176880, (float)0.316528, (float)0.581421,
- (float)0.416382, (float)0.625977, (float)0.805176,
- (float)0.303223, (float)0.568726, (float)0.915039,
- (float)0.203613, (float)0.351440, (float)0.588135,
- (float)0.221191, (float)0.375000, (float)0.614746,
- (float)0.199951, (float)0.323364, (float)0.476074,
- (float)0.300781, (float)0.433350, (float)0.566895,
- (float)0.226196, (float)0.354004, (float)0.507568,
- (float)0.300049, (float)0.508179, (float)0.711670,
- (float)0.312012, (float)0.492676, (float)0.763428,
- (float)0.329956, (float)0.541016, (float)0.795776,
- (float)0.373779, (float)0.604614, (float)0.928833,
- (float)0.210571, (float)0.452026, (float)0.755249,
- (float)0.271118, (float)0.473267, (float)0.662476,
- (float)0.285522, (float)0.436890, (float)0.634399,
- (float)0.246704, (float)0.565552, (float)0.859009,
- (float)0.270508, (float)0.406250, (float)0.553589,
- (float)0.361450, (float)0.578491, (float)0.813843,
- (float)0.342651, (float)0.482788, (float)0.622437,
- (float)0.340332, (float)0.549438, (float)0.743164,
- (float)0.200439, (float)0.336304, (float)0.540894,
- (float)0.407837, (float)0.644775, (float)0.895142,
- (float)0.294678, (float)0.454834, (float)0.699097,
- (float)0.193115, (float)0.344482, (float)0.643188,
- (float)0.275757, (float)0.420776, (float)0.598755,
- (float)0.380493, (float)0.608643, (float)0.861084,
- (float)0.222778, (float)0.426147, (float)0.676514,
- (float)0.407471, (float)0.700195, (float)1.053101,
- (float)0.218384, (float)0.377197, (float)0.669922,
- (float)0.313232, (float)0.454102, (float)0.600952,
- (float)0.347412, (float)0.571533, (float)0.874146,
- (float)0.238037, (float)0.405396, (float)0.729492,
- (float)0.223877, (float)0.412964, (float)0.822021,
- (float)0.395264, (float)0.582153, (float)0.743896,
-
-
-
-
-
- (float)0.247925, (float)0.485596, (float)0.720581,
- (float)0.229126, (float)0.496582, (float)0.907715,
- (float)0.260132, (float)0.566895, (float)1.012695,
- (float)0.337402, (float)0.611572, (float)0.978149,
- (float)0.267822, (float)0.447632, (float)0.769287,
- (float)0.250610, (float)0.381714, (float)0.530029,
- (float)0.430054, (float)0.805054, (float)1.221924,
- (float)0.382568, (float)0.544067, (float)0.701660,
- (float)0.383545, (float)0.710327, (float)1.149170,
- (float)0.271362, (float)0.529053, (float)0.775513,
- (float)0.246826, (float)0.393555, (float)0.588623,
- (float)0.266846, (float)0.422119, (float)0.676758,
- (float)0.311523, (float)0.580688, (float)0.838623,
- (float)1.331177, (float)1.576782, (float)1.779541,
- (float)1.160034, (float)1.401978, (float)1.768188,
- (float)1.161865, (float)1.525146, (float)1.715332,
- (float)0.759521, (float)0.913940, (float)1.119873,
- (float)0.947144, (float)1.121338, (float)1.282471,
- (float)1.015015, (float)1.557007, (float)1.804932,
- (float)1.172974, (float)1.402100, (float)1.692627,
- (float)1.087524, (float)1.474243, (float)1.665405,
- (float)0.899536, (float)1.105225, (float)1.406250,
- (float)1.148438, (float)1.484741, (float)1.796265,
- (float)0.785645, (float)1.209839, (float)1.567749,
- (float)0.867798, (float)1.166504, (float)1.450684,
- (float)0.922485, (float)1.229858, (float)1.420898,
- (float)0.791260, (float)1.123291, (float)1.409546,
- (float)0.788940, (float)0.966064, (float)1.340332,
- (float)1.051147, (float)1.272827, (float)1.556641,
- (float)0.866821, (float)1.181152, (float)1.538818,
- (float)0.906738, (float)1.373535, (float)1.607910,
- (float)1.244751, (float)1.581421, (float)1.933838,
- (float)0.913940, (float)1.337280, (float)1.539673,
- (float)0.680542, (float)0.959229, (float)1.662720,
- (float)0.887207, (float)1.430542, (float)1.800781,
- (float)0.912598, (float)1.433594, (float)1.683960,
- (float)0.860474, (float)1.060303, (float)1.455322,
- (float)1.005127, (float)1.381104, (float)1.706909,
- (float)0.800781, (float)1.363892, (float)1.829102,
- (float)0.781860, (float)1.124390, (float)1.505981,
- (float)1.003662, (float)1.471436, (float)1.684692,
- (float)0.981323, (float)1.309570, (float)1.618042,
- (float)1.228760, (float)1.554321, (float)1.756470,
- (float)0.734375, (float)0.895752, (float)1.225586,
- (float)0.841797, (float)1.055664, (float)1.249268,
- (float)0.920166, (float)1.119385, (float)1.486206,
- (float)0.894409, (float)1.539063, (float)1.828979,
- (float)1.283691, (float)1.543335, (float)1.858276,
-
-
-
-
-
- (float)0.676025, (float)0.933105, (float)1.490845,
- (float)0.821289, (float)1.491821, (float)1.739868,
- (float)0.923218, (float)1.144653, (float)1.580566,
- (float)1.057251, (float)1.345581, (float)1.635864,
- (float)0.888672, (float)1.074951, (float)1.353149,
- (float)0.942749, (float)1.195435, (float)1.505493,
- (float)1.492310, (float)1.788086, (float)2.039673,
- (float)1.070313, (float)1.634399, (float)1.860962,
- (float)1.253296, (float)1.488892, (float)1.686035,
- (float)0.647095, (float)0.864014, (float)1.401855,
- (float)0.866699, (float)1.254883, (float)1.453369,
- (float)1.063965, (float)1.532593, (float)1.731323,
- (float)1.167847, (float)1.521484, (float)1.884033,
- (float)0.956055, (float)1.502075, (float)1.745605,
- (float)0.928711, (float)1.288574, (float)1.479614,
- (float)1.088013, (float)1.380737, (float)1.570801,
- (float)0.905029, (float)1.186768, (float)1.371948,
- (float)1.057861, (float)1.421021, (float)1.617432,
- (float)1.108276, (float)1.312500, (float)1.501465,
- (float)0.979492, (float)1.416992, (float)1.624268,
- (float)1.276001, (float)1.661011, (float)2.007935,
- (float)0.993042, (float)1.168579, (float)1.331665,
- (float)0.778198, (float)0.944946, (float)1.235962,
- (float)1.223755, (float)1.491333, (float)1.815674,
- (float)0.852661, (float)1.350464, (float)1.722290,
- (float)1.134766, (float)1.593140, (float)1.787354,
- (float)1.051392, (float)1.339722, (float)1.531006,
- (float)0.803589, (float)1.271240, (float)1.652100,
- (float)0.755737, (float)1.143555, (float)1.639404,
- (float)0.700928, (float)0.837280, (float)1.130371,
- (float)0.942749, (float)1.197876, (float)1.669800,
- (float)0.993286, (float)1.378296, (float)1.566528,
- (float)0.801025, (float)1.095337, (float)1.298950,
- (float)0.739990, (float)1.032959, (float)1.383667,
- (float)0.845703, (float)1.072266, (float)1.543823,
- (float)0.915649, (float)1.072266, (float)1.224487,
- (float)1.021973, (float)1.226196, (float)1.481323,
- (float)0.999878, (float)1.204102, (float)1.555908,
- (float)0.722290, (float)0.913940, (float)1.340210,
- (float)0.673340, (float)0.835938, (float)1.259521,
- (float)0.832397, (float)1.208374, (float)1.394165,
- (float)0.962158, (float)1.576172, (float)1.912842,
- (float)1.166748, (float)1.370850, (float)1.556763,
- (float)0.946289, (float)1.138550, (float)1.400391,
- (float)1.035034, (float)1.218262, (float)1.386475,
- (float)1.393799, (float)1.717773, (float)2.000244,
- (float)0.972656, (float)1.260986, (float)1.760620,
- (float)1.028198, (float)1.288452, (float)1.484619,
-
-
-
-
-
- (float)0.773560, (float)1.258057, (float)1.756714,
- (float)1.080322, (float)1.328003, (float)1.742676,
- (float)0.823975, (float)1.450806, (float)1.917725,
- (float)0.859009, (float)1.016602, (float)1.191895,
- (float)0.843994, (float)1.131104, (float)1.645020,
- (float)1.189697, (float)1.702759, (float)1.894409,
- (float)1.346680, (float)1.763184, (float)2.066040,
- (float)0.980469, (float)1.253784, (float)1.441650,
- (float)1.338135, (float)1.641968, (float)1.932739,
- (float)1.223267, (float)1.424194, (float)1.626465,
- (float)0.765747, (float)1.004150, (float)1.579102,
- (float)1.042847, (float)1.269165, (float)1.647461,
- (float)0.968750, (float)1.257568, (float)1.555786,
- (float)0.826294, (float)0.993408, (float)1.275146,
- (float)0.742310, (float)0.950439, (float)1.430542,
- (float)1.054321, (float)1.439819, (float)1.828003,
- (float)1.072998, (float)1.261719, (float)1.441895,
- (float)0.859375, (float)1.036377, (float)1.314819,
- (float)0.895752, (float)1.267212, (float)1.605591,
- (float)0.805420, (float)0.962891, (float)1.142334,
- (float)0.795654, (float)1.005493, (float)1.468506,
- (float)1.105347, (float)1.313843, (float)1.584839,
- (float)0.792236, (float)1.221802, (float)1.465698,
- (float)1.170532, (float)1.467651, (float)1.664063,
- (float)0.838257, (float)1.153198, (float)1.342163,
- (float)0.968018, (float)1.198242, (float)1.391235,
- (float)1.250122, (float)1.623535, (float)1.823608,
- (float)0.711670, (float)1.058350, (float)1.512085,
- (float)1.204834, (float)1.454468, (float)1.739136,
- (float)1.137451, (float)1.421753, (float)1.620117,
- (float)0.820435, (float)1.322754, (float)1.578247,
- (float)0.798706, (float)1.005005, (float)1.213867,
- (float)0.980713, (float)1.324951, (float)1.512939,
- (float)1.112305, (float)1.438843, (float)1.735596,
- (float)1.135498, (float)1.356689, (float)1.635742,
- (float)1.101318, (float)1.387451, (float)1.686523,
- (float)0.849854, (float)1.276978, (float)1.523438,
- (float)1.377930, (float)1.627563, (float)1.858154,
- (float)0.884888, (float)1.095459, (float)1.287476,
- (float)1.289795, (float)1.505859, (float)1.756592,
- (float)0.817505, (float)1.384155, (float)1.650513,
- (float)1.446655, (float)1.702148, (float)1.931885,
- (float)0.835815, (float)1.023071, (float)1.385376,
- (float)0.916626, (float)1.139038, (float)1.335327,
- (float)0.980103, (float)1.174072, (float)1.453735,
- (float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408,
- (float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904,
- (float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477,
-
-
-
-
-
- (float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083,
- (float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196,
- (float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396,
- (float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854,
- (float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408,
- (float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987,
- (float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666,
- (float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434,
- (float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781,
- (float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416,
- (float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288,
- (float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672,
- (float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890,
- (float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508,
- (float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206,
- (float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086,
- (float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223,
- (float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101,
- (float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703,
- (float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094,
- (float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450,
- (float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704,
- (float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653,
- (float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723,
- (float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634,
- (float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494,
- (float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370,
- (float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542,
- (float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091,
- (float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346,
- (float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219,
- (float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810,
- (float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914,
- (float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198,
- (float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104,
- (float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892,
- (float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852,
- (float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199,
- (float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286,
- (float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127,
- (float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748,
- (float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676,
- (float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910,
- (float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555,
- (float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023,
- (float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851,
- (float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014,
- (float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307,
-
-
-
-
-
- (float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637,
- (float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643,
- (float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968,
- (float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562,
- (float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646,
- (float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818,
- (float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466,
- (float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945,
- (float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941,
- (float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618,
- (float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922,
- (float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794,
- (float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570,
- (float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595,
- (float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673,
- (float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925,
- (float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984,
- (float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904,
- (float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256,
- (float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279,
- (float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602,
- (float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331,
- (float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999,
- (float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096,
- (float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234,
- (float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771,
- (float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076,
- (float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058,
- (float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623,
- (float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284,
- (float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021,
- (float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693,
- (float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760,
- (float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676,
- (float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834,
- (float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058,
- (float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929,
- (float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892,
- (float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417,
- (float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149,
- (float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666,
- (float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521,
- (float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646,
- (float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247,
- (float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583,
- (float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876,
- (float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465,
- (float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253,
-
-
-
-
-
- (float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234,
- (float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402,
- (float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406,
- (float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807,
- (float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414,
- (float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991,
- (float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290,
- (float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414,
- (float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647,
- (float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145,
- (float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520,
- (float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117,
- (float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576,
- (float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705,
- (float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007,
- (float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964,
- (float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073,
- (float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873,
- (float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558,
- (float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791,
- (float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857,
- (float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050,
- (float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127,
- (float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545,
- (float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259,
- (float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993,
- (float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912,
- (float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757,
- (float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143
- };
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/constants.h b/sflphone-common/libs/pjproject/third_party/ilbc/constants.h
deleted file mode 100644
index 3487d529dbecc8fd7799e47870e3908550b55fdf..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/constants.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- constants.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_CONSTANTS_H
- #define __iLBC_CONSTANTS_H
-
- #include "iLBC_define.h"
-
-
- /* ULP bit allocation */
-
-
-
-
-
-
- extern const iLBC_ULP_Inst_t ULP_20msTbl;
- extern const iLBC_ULP_Inst_t ULP_30msTbl;
-
- /* high pass filters */
-
- extern float hpi_zero_coefsTbl[];
- extern float hpi_pole_coefsTbl[];
- extern float hpo_zero_coefsTbl[];
- extern float hpo_pole_coefsTbl[];
-
- /* low pass filters */
- extern float lpFilt_coefsTbl[];
-
- /* LPC analysis and quantization */
-
- extern float lpc_winTbl[];
- extern float lpc_asymwinTbl[];
- extern float lpc_lagwinTbl[];
- extern float lsfCbTbl[];
- extern float lsfmeanTbl[];
- extern int dim_lsfCbTbl[];
- extern int size_lsfCbTbl[];
- extern float lsf_weightTbl_30ms[];
- extern float lsf_weightTbl_20ms[];
-
- /* state quantization tables */
-
- extern float state_sq3Tbl[];
- extern float state_frgqTbl[];
-
- /* gain quantization tables */
-
- extern float gain_sq3Tbl[];
- extern float gain_sq4Tbl[];
- extern float gain_sq5Tbl[];
-
- /* adaptive codebook definitions */
-
- extern int search_rangeTbl[5][CB_NSTAGES];
- extern int memLfTbl[];
- extern int stMemLTbl;
- extern float cbfiltersTbl[CB_FILTERLEN];
-
- /* enhancer definitions */
-
- extern float polyphaserTbl[];
- extern float enh_plocsTbl[];
-
-
-
-
-
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/createCB.c b/sflphone-common/libs/pjproject/third_party/ilbc/createCB.c
deleted file mode 100644
index aefacf200aa83c88e8f55bb9e0a44b053e2047b3..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/createCB.c
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- createCB.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
-
-
-
-
- #include "iLBC_define.h"
- #include "constants.h"
- #include <string.h>
- #include <math.h>
-
- /*----------------------------------------------------------------*
- * Construct an additional codebook vector by filtering the
- * initial codebook buffer. This vector is then used to expand
- * the codebook with an additional section.
- *---------------------------------------------------------------*/
-
- void filteredCBvecs(
- float *cbvectors, /* (o) Codebook vectors for the
- higher section */
- float *mem, /* (i) Buffer to create codebook
- vector from */
- int lMem /* (i) Length of buffer */
- ){
- int j, k;
- float *pp, *pp1;
- float tempbuff2[CB_MEML+CB_FILTERLEN];
- float *pos;
-
- memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float));
- memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float));
- memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0,
- (CB_HALFFILTERLEN+1)*sizeof(float));
-
- /* Create codebook vector for higher section by filtering */
-
- /* do filtering */
- pos=cbvectors;
- memset(pos, 0, lMem*sizeof(float));
- for (k=0; k<lMem; k++) {
- pp=&tempbuff2[k];
- pp1=&cbfiltersTbl[CB_FILTERLEN-1];
- for (j=0;j<CB_FILTERLEN;j++) {
- (*pos)+=(*pp++)*(*pp1--);
- }
- pos++;
- }
- }
-
- /*----------------------------------------------------------------*
- * Search the augmented part of the codebook to find the best
- * measure.
- *----------------------------------------------------------------*/
-
-
-
-
-
-
- void searchAugmentedCB(
- int low, /* (i) Start index for the search */
- int high, /* (i) End index for the search */
- int stage, /* (i) Current stage */
- int startIndex, /* (i) Codebook index for the first
- aug vector */
- float *target, /* (i) Target vector for encoding */
- float *buffer, /* (i) Pointer to the end of the buffer for
- augmented codebook construction */
- float *max_measure, /* (i/o) Currently maximum measure */
- int *best_index,/* (o) Currently the best index */
- float *gain, /* (o) Currently the best gain */
- float *energy, /* (o) Energy of augmented codebook
- vectors */
- float *invenergy/* (o) Inv energy of augmented codebook
- vectors */
- ) {
- int icount, ilow, j, tmpIndex;
- float *pp, *ppo, *ppi, *ppe, crossDot, alfa;
- float weighted, measure, nrjRecursive;
- float ftmp;
-
- /* Compute the energy for the first (low-5)
- noninterpolated samples */
- nrjRecursive = (float) 0.0;
- pp = buffer - low + 1;
- for (j=0; j<(low-5); j++) {
- nrjRecursive += ( (*pp)*(*pp) );
- pp++;
- }
- ppe = buffer - low;
-
-
- for (icount=low; icount<=high; icount++) {
-
- /* Index of the codebook vector used for retrieving
- energy values */
- tmpIndex = startIndex+icount-20;
-
- ilow = icount-4;
-
- /* Update the energy recursively to save complexity */
- nrjRecursive = nrjRecursive + (*ppe)*(*ppe);
- ppe--;
- energy[tmpIndex] = nrjRecursive;
-
- /* Compute cross dot product for the first (low-5)
- samples */
-
-
-
-
-
- crossDot = (float) 0.0;
- pp = buffer-icount;
- for (j=0; j<ilow; j++) {
- crossDot += target[j]*(*pp++);
- }
-
- /* interpolation */
- alfa = (float) 0.2;
- ppo = buffer-4;
- ppi = buffer-icount-4;
- for (j=ilow; j<icount; j++) {
- weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
- ppo++;
- ppi++;
- energy[tmpIndex] += weighted*weighted;
- crossDot += target[j]*weighted;
- alfa += (float)0.2;
- }
-
- /* Compute energy and cross dot product for the
- remaining samples */
- pp = buffer - icount;
- for (j=icount; j<SUBL; j++) {
- energy[tmpIndex] += (*pp)*(*pp);
- crossDot += target[j]*(*pp++);
- }
-
- if (energy[tmpIndex]>0.0) {
- invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS);
- } else {
- invenergy[tmpIndex] = (float) 0.0;
- }
-
- if (stage==0) {
- measure = (float)-10000000.0;
-
- if (crossDot > 0.0) {
- measure = crossDot*crossDot*invenergy[tmpIndex];
- }
- }
- else {
- measure = crossDot*crossDot*invenergy[tmpIndex];
- }
-
- /* check if measure is better */
- ftmp = crossDot*invenergy[tmpIndex];
-
- if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-
-
-
-
-
- *best_index = tmpIndex;
- *max_measure = measure;
- *gain = ftmp;
- }
- }
- }
-
-
- /*----------------------------------------------------------------*
- * Recreate a specific codebook vector from the augmented part.
- *
- *----------------------------------------------------------------*/
-
- void createAugmentedVec(
- int index, /* (i) Index for the augmented vector
- to be created */
- float *buffer, /* (i) Pointer to the end of the buffer for
- augmented codebook construction */
- float *cbVec/* (o) The construced codebook vector */
- ) {
- int ilow, j;
- float *pp, *ppo, *ppi, alfa, alfa1, weighted;
-
- ilow = index-5;
-
- /* copy the first noninterpolated part */
-
- pp = buffer-index;
- memcpy(cbVec,pp,sizeof(float)*index);
-
- /* interpolation */
-
- alfa1 = (float)0.2;
- alfa = 0.0;
- ppo = buffer-5;
- ppi = buffer-index-5;
- for (j=ilow; j<index; j++) {
- weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
- ppo++;
- ppi++;
- cbVec[j] = weighted;
- alfa += alfa1;
- }
-
- /* copy the second noninterpolated part */
-
- pp = buffer - index;
- memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index));
-
-
-
-
-
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/createCB.h b/sflphone-common/libs/pjproject/third_party/ilbc/createCB.h
deleted file mode 100644
index eda547c6692451e297ad38421e4040d716d2acb1..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/createCB.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- createCB.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_CREATECB_H
- #define __iLBC_CREATECB_H
-
- void filteredCBvecs(
- float *cbvectors, /* (o) Codebook vector for the
- higher section */
-
-
-
-
-
- float *mem, /* (i) Buffer to create codebook
- vectors from */
- int lMem /* (i) Length of buffer */
- );
-
- void searchAugmentedCB(
- int low, /* (i) Start index for the search */
- int high, /* (i) End index for the search */
- int stage, /* (i) Current stage */
- int startIndex, /* (i) CB index for the first
- augmented vector */
- float *target, /* (i) Target vector for encoding */
- float *buffer, /* (i) Pointer to the end of the
- buffer for augmented codebook
- construction */
- float *max_measure, /* (i/o) Currently maximum measure */
- int *best_index,/* (o) Currently the best index */
- float *gain, /* (o) Currently the best gain */
- float *energy, /* (o) Energy of augmented
- codebook vectors */
- float *invenergy/* (o) Inv energy of aug codebook
- vectors */
- );
-
- void createAugmentedVec(
- int index, /* (i) Index for the aug vector
- to be created */
- float *buffer, /* (i) Pointer to the end of the
- buffer for augmented codebook
- construction */
- float *cbVec /* (o) The construced codebook vector */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/doCPLC.c b/sflphone-common/libs/pjproject/third_party/ilbc/doCPLC.c
deleted file mode 100644
index 9fa4584fe8dee53efca3d398a936c573a9d10070..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/doCPLC.c
+++ /dev/null
@@ -1,270 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- doCPLC.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <string.h>
- #include <stdio.h>
-
-
-
-
-
- #include "iLBC_define.h"
-
- /*----------------------------------------------------------------*
- * Compute cross correlation and pitch gain for pitch prediction
- * of last subframe at given lag.
- *---------------------------------------------------------------*/
-
- void compCorr(
- float *cc, /* (o) cross correlation coefficient */
- float *gc, /* (o) gain */
- float *pm,
- float *buffer, /* (i) signal buffer */
- int lag, /* (i) pitch lag */
- int bLen, /* (i) length of buffer */
- int sRange /* (i) correlation search length */
- ){
- int i;
- float ftmp1, ftmp2, ftmp3;
-
- /* Guard against getting outside buffer */
- if ((bLen-sRange-lag)<0) {
- sRange=bLen-lag;
- }
-
- ftmp1 = 0.0;
- ftmp2 = 0.0;
- ftmp3 = 0.0;
- for (i=0; i<sRange; i++) {
- ftmp1 += buffer[bLen-sRange+i] *
- buffer[bLen-sRange+i-lag];
- ftmp2 += buffer[bLen-sRange+i-lag] *
- buffer[bLen-sRange+i-lag];
- ftmp3 += buffer[bLen-sRange+i] *
- buffer[bLen-sRange+i];
- }
-
- if (ftmp2 > 0.0) {
- *cc = ftmp1*ftmp1/ftmp2;
- *gc = (float)fabs(ftmp1/ftmp2);
- *pm=(float)fabs(ftmp1)/
- ((float)sqrt(ftmp2)*(float)sqrt(ftmp3));
- }
- else {
- *cc = 0.0;
- *gc = 0.0;
- *pm=0.0;
- }
- }
-
-
-
-
-
- /*----------------------------------------------------------------*
- * Packet loss concealment routine. Conceals a residual signal
- * and LP parameters. If no packet loss, update state.
- *---------------------------------------------------------------*/
-
- void doThePLC(
- float *PLCresidual, /* (o) concealed residual */
- float *PLClpc, /* (o) concealed LP parameters */
- int PLI, /* (i) packet loss indicator
- 0 - no PL, 1 = PL */
- float *decresidual, /* (i) decoded residual */
- float *lpc, /* (i) decoded LPC (only used for no PL) */
- int inlag, /* (i) pitch lag */
- iLBC_Dec_Inst_t *iLBCdec_inst
- /* (i/o) decoder instance */
- ){
- int lag=20, randlag;
- float gain, maxcc;
- float use_gain;
- float gain_comp, maxcc_comp, per, max_per=0;
- int i, pick, use_lag;
- float ftmp, randvec[BLOCKL_MAX], pitchfact, energy;
-
- /* Packet Loss */
-
- if (PLI == 1) {
-
- iLBCdec_inst->consPLICount += 1;
-
- /* if previous frame not lost,
- determine pitch pred. gain */
-
- if (iLBCdec_inst->prevPLI != 1) {
-
- /* Search around the previous lag to find the
- best pitch period */
-
- lag=inlag-3;
- compCorr(&maxcc, &gain, &max_per,
- iLBCdec_inst->prevResidual,
- lag, iLBCdec_inst->blockl, 60);
- for (i=inlag-2;i<=inlag+3;i++) {
- compCorr(&maxcc_comp, &gain_comp, &per,
- iLBCdec_inst->prevResidual,
- i, iLBCdec_inst->blockl, 60);
-
- if (maxcc_comp>maxcc) {
- maxcc=maxcc_comp;
-
-
-
-
-
- gain=gain_comp;
- lag=i;
- max_per=per;
- }
- }
-
- }
-
- /* previous frame lost, use recorded lag and periodicity */
-
- else {
- lag=iLBCdec_inst->prevLag;
- max_per=iLBCdec_inst->per;
- }
-
- /* downscaling */
-
- use_gain=1.0;
- if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320)
- use_gain=(float)0.9;
- else if (iLBCdec_inst->consPLICount*
- iLBCdec_inst->blockl>2*320)
- use_gain=(float)0.7;
- else if (iLBCdec_inst->consPLICount*
- iLBCdec_inst->blockl>3*320)
- use_gain=(float)0.5;
- else if (iLBCdec_inst->consPLICount*
- iLBCdec_inst->blockl>4*320)
- use_gain=(float)0.0;
-
- /* mix noise and pitch repeatition */
- ftmp=(float)sqrt(max_per);
- if (ftmp>(float)0.7)
- pitchfact=(float)1.0;
- else if (ftmp>(float)0.4)
- pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4);
- else
- pitchfact=0.0;
-
-
- /* avoid repetition of same pitch cycle */
- use_lag=lag;
- if (lag<80) {
- use_lag=2*lag;
- }
-
- /* compute concealed residual */
-
-
-
-
-
-
- energy = 0.0;
- for (i=0; i<iLBCdec_inst->blockl; i++) {
-
- /* noise component */
-
- iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) &
- (0x80000000L-1);
- randlag = 50 + ((signed long) iLBCdec_inst->seed)%70;
- pick = i - randlag;
-
- if (pick < 0) {
- randvec[i] =
- iLBCdec_inst->prevResidual[
- iLBCdec_inst->blockl+pick];
- } else {
- randvec[i] = randvec[pick];
- }
-
- /* pitch repeatition component */
- pick = i - use_lag;
-
- if (pick < 0) {
- PLCresidual[i] =
- iLBCdec_inst->prevResidual[
- iLBCdec_inst->blockl+pick];
- } else {
- PLCresidual[i] = PLCresidual[pick];
- }
-
- /* mix random and periodicity component */
-
- if (i<80)
- PLCresidual[i] = use_gain*(pitchfact *
- PLCresidual[i] +
- ((float)1.0 - pitchfact) * randvec[i]);
- else if (i<160)
- PLCresidual[i] = (float)0.95*use_gain*(pitchfact *
- PLCresidual[i] +
- ((float)1.0 - pitchfact) * randvec[i]);
- else
- PLCresidual[i] = (float)0.9*use_gain*(pitchfact *
- PLCresidual[i] +
- ((float)1.0 - pitchfact) * randvec[i]);
-
- energy += PLCresidual[i] * PLCresidual[i];
- }
-
- /* less than 30 dB, use only noise */
-
-
-
-
-
-
- if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) {
- gain=0.0;
- for (i=0; i<iLBCdec_inst->blockl; i++) {
- PLCresidual[i] = randvec[i];
- }
- }
-
- /* use old LPC */
-
- memcpy(PLClpc,iLBCdec_inst->prevLpc,
- (LPC_FILTERORDER+1)*sizeof(float));
-
- }
-
- /* no packet loss, copy input */
-
- else {
- memcpy(PLCresidual, decresidual,
- iLBCdec_inst->blockl*sizeof(float));
- memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float));
- iLBCdec_inst->consPLICount = 0;
- }
-
- /* update state */
-
- if (PLI) {
- iLBCdec_inst->prevLag = lag;
- iLBCdec_inst->per=max_per;
- }
-
- iLBCdec_inst->prevPLI = PLI;
- memcpy(iLBCdec_inst->prevLpc, PLClpc,
- (LPC_FILTERORDER+1)*sizeof(float));
- memcpy(iLBCdec_inst->prevResidual, PLCresidual,
- iLBCdec_inst->blockl*sizeof(float));
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/doCPLC.h b/sflphone-common/libs/pjproject/third_party/ilbc/doCPLC.h
deleted file mode 100644
index 2bda7a144108248dd1de2e37fb59bf94ef55817d..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/doCPLC.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- doCPLC.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_DOLPC_H
- #define __iLBC_DOLPC_H
-
- void doThePLC(
- float *PLCresidual, /* (o) concealed residual */
- float *PLClpc, /* (o) concealed LP parameters */
- int PLI, /* (i) packet loss indicator
- 0 - no PL, 1 = PL */
- float *decresidual, /* (i) decoded residual */
- float *lpc, /* (i) decoded LPC (only used for no PL) */
- int inlag, /* (i) pitch lag */
- iLBC_Dec_Inst_t *iLBCdec_inst
- /* (i/o) decoder instance */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/enhancer.c b/sflphone-common/libs/pjproject/third_party/ilbc/enhancer.c
deleted file mode 100644
index dee13b03d5b1007292d8cfa9275d3617301f4718..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/enhancer.c
+++ /dev/null
@@ -1,701 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- enhancer.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <string.h>
- #include "iLBC_define.h"
- #include "constants.h"
- #include "filter.h"
-
- /*----------------------------------------------------------------*
- * Find index in array such that the array element with said
- * index is the element of said array closest to "value"
- * according to the squared-error criterion
- *---------------------------------------------------------------*/
-
- void NearestNeighbor(
-
-
-
-
-
- int *index, /* (o) index of array element closest
- to value */
- float *array, /* (i) data array */
- float value,/* (i) value */
- int arlength/* (i) dimension of data array */
- ){
- int i;
- float bestcrit,crit;
-
- crit=array[0]-value;
- bestcrit=crit*crit;
- *index=0;
- for (i=1; i<arlength; i++) {
- crit=array[i]-value;
- crit=crit*crit;
-
- if (crit<bestcrit) {
- bestcrit=crit;
- *index=i;
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * compute cross correlation between sequences
- *---------------------------------------------------------------*/
-
- void mycorr1(
- float* corr, /* (o) correlation of seq1 and seq2 */
- float* seq1, /* (i) first sequence */
- int dim1, /* (i) dimension first seq1 */
- const float *seq2, /* (i) second sequence */
- int dim2 /* (i) dimension seq2 */
- ){
- int i,j;
-
- for (i=0; i<=dim1-dim2; i++) {
- corr[i]=0.0;
- for (j=0; j<dim2; j++) {
- corr[i] += seq1[i+j] * seq2[j];
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * upsample finite array assuming zeros outside bounds
- *---------------------------------------------------------------*/
-
-
-
-
-
-
- void enh_upsample(
- float* useq1, /* (o) upsampled output sequence */
- float* seq1,/* (i) unupsampled sequence */
- int dim1, /* (i) dimension seq1 */
- int hfl /* (i) polyphase filter length=2*hfl+1 */
- ){
- float *pu,*ps;
- int i,j,k,q,filterlength,hfl2;
- const float *polyp[ENH_UPS0]; /* pointers to
- polyphase columns */
- const float *pp;
-
- /* define pointers for filter */
-
- filterlength=2*hfl+1;
-
- if ( filterlength > dim1 ) {
- hfl2=(int) (dim1/2);
- for (j=0; j<ENH_UPS0; j++) {
- polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2;
- }
- hfl=hfl2;
- filterlength=2*hfl+1;
- }
- else {
- for (j=0; j<ENH_UPS0; j++) {
- polyp[j]=polyphaserTbl+j*filterlength;
- }
- }
-
- /* filtering: filter overhangs left side of sequence */
-
- pu=useq1;
- for (i=hfl; i<filterlength; i++) {
- for (j=0; j<ENH_UPS0; j++) {
- *pu=0.0;
- pp = polyp[j];
- ps = seq1+i;
- for (k=0; k<=i; k++) {
- *pu += *ps-- * *pp++;
- }
- pu++;
- }
- }
-
- /* filtering: simple convolution=inner products */
-
- for (i=filterlength; i<dim1; i++) {
-
-
-
-
-
- for (j=0;j<ENH_UPS0; j++){
- *pu=0.0;
- pp = polyp[j];
- ps = seq1+i;
- for (k=0; k<filterlength; k++) {
- *pu += *ps-- * *pp++;
- }
- pu++;
- }
- }
-
- /* filtering: filter overhangs right side of sequence */
-
- for (q=1; q<=hfl; q++) {
- for (j=0; j<ENH_UPS0; j++) {
- *pu=0.0;
- pp = polyp[j]+q;
- ps = seq1+dim1-1;
- for (k=0; k<filterlength-q; k++) {
- *pu += *ps-- * *pp++;
- }
- pu++;
- }
- }
- }
-
-
- /*----------------------------------------------------------------*
- * find segment starting near idata+estSegPos that has highest
- * correlation with idata+centerStartPos through
- * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a
- * resolution of ENH_UPSO times the original of the original
- * sampling rate
- *---------------------------------------------------------------*/
-
- void refiner(
- float *seg, /* (o) segment array */
- float *updStartPos, /* (o) updated start point */
- float* idata, /* (i) original data buffer */
- int idatal, /* (i) dimension of idata */
- int centerStartPos, /* (i) beginning center segment */
- float estSegPos,/* (i) estimated beginning other segment */
- float period /* (i) estimated pitch period */
- ){
- int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim;
- int tloc,tloc2,i,st,en,fraction;
- float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv;
- float corrVecUps[ENH_CORRDIM*ENH_UPS0];
-
- (void)period;
-
-
-
- /* defining array bounds */
-
- estSegPosRounded=(int)(estSegPos - 0.5);
-
- searchSegStartPos=estSegPosRounded-ENH_SLOP;
-
- if (searchSegStartPos<0) {
- searchSegStartPos=0;
- }
- searchSegEndPos=estSegPosRounded+ENH_SLOP;
-
- if (searchSegEndPos+ENH_BLOCKL >= idatal) {
- searchSegEndPos=idatal-ENH_BLOCKL-1;
- }
- corrdim=searchSegEndPos-searchSegStartPos+1;
-
- /* compute upsampled correlation (corr33) and find
- location of max */
-
- mycorr1(corrVec,idata+searchSegStartPos,
- corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL);
- enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0);
- tloc=0; maxv=corrVecUps[0];
- for (i=1; i<ENH_UPS0*corrdim; i++) {
-
- if (corrVecUps[i]>maxv) {
- tloc=i;
- maxv=corrVecUps[i];
- }
- }
-
- /* make vector can be upsampled without ever running outside
- bounds */
-
- *updStartPos= (float)searchSegStartPos +
- (float)tloc/(float)ENH_UPS0+(float)1.0;
- tloc2=(int)(tloc/ENH_UPS0);
-
- if (tloc>tloc2*ENH_UPS0) {
- tloc2++;
- }
- st=searchSegStartPos+tloc2-ENH_FL0;
-
- if (st<0) {
- memset(vect,0,-st*sizeof(float));
- memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float));
- }
- else {
-
-
-
-
-
- en=st+ENH_VECTL;
-
- if (en>idatal) {
- memcpy(vect, &idata[st],
- (ENH_VECTL-(en-idatal))*sizeof(float));
- memset(&vect[ENH_VECTL-(en-idatal)], 0,
- (en-idatal)*sizeof(float));
- }
- else {
- memcpy(vect, &idata[st], ENH_VECTL*sizeof(float));
- }
- }
- fraction=tloc2*ENH_UPS0-tloc;
-
- /* compute the segment (this is actually a convolution) */
-
- mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction,
- 2*ENH_FL0+1);
- }
-
- /*----------------------------------------------------------------*
- * find the smoothed output data
- *---------------------------------------------------------------*/
-
- void smath(
- float *odata, /* (o) smoothed output */
- float *sseq,/* (i) said second sequence of waveforms */
- int hl, /* (i) 2*hl+1 is sseq dimension */
- float alpha0/* (i) max smoothing energy fraction */
- ){
- int i,k;
- float w00,w10,w11,A,B,C,*psseq,err,errs;
- float surround[BLOCKL_MAX]; /* shape contributed by other than
- current */
- float wt[2*ENH_HL+1]; /* waveform weighting to get
- surround shape */
- float denom;
-
- /* create shape of contribution from all waveforms except the
- current one */
-
- for (i=1; i<=2*hl+1; i++) {
- wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2)));
- }
- wt[hl]=0.0; /* for clarity, not used */
- for (i=0; i<ENH_BLOCKL; i++) {
- surround[i]=sseq[i]*wt[0];
- }
-
-
-
-
-
- for (k=1; k<hl; k++) {
- psseq=sseq+k*ENH_BLOCKL;
- for(i=0;i<ENH_BLOCKL; i++) {
- surround[i]+=psseq[i]*wt[k];
- }
- }
- for (k=hl+1; k<=2*hl; k++) {
- psseq=sseq+k*ENH_BLOCKL;
- for(i=0;i<ENH_BLOCKL; i++) {
- surround[i]+=psseq[i]*wt[k];
- }
- }
-
- /* compute some inner products */
-
- w00 = w10 = w11 = 0.0;
- psseq=sseq+hl*ENH_BLOCKL; /* current block */
- for (i=0; i<ENH_BLOCKL;i++) {
- w00+=psseq[i]*psseq[i];
- w11+=surround[i]*surround[i];
- w10+=surround[i]*psseq[i];
- }
-
- if (fabs(w11) < 1.0) {
- w11=1.0;
- }
- C = (float)sqrt( w00/w11);
-
- /* first try enhancement without power-constraint */
-
- errs=0.0;
- psseq=sseq+hl*ENH_BLOCKL;
- for (i=0; i<ENH_BLOCKL; i++) {
- odata[i]=C*surround[i];
- err=psseq[i]-odata[i];
- errs+=err*err;
- }
-
- /* if constraint violated by first try, add constraint */
-
- if (errs > alpha0 * w00) {
- if ( w00 < 1) {
- w00=1;
- }
- denom = (w11*w00-w10*w10)/(w00*w00);
-
- if (denom > 0.0001) { /* eliminates numerical problems
- for if smooth */
-
-
-
-
-
- A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom);
- B = -alpha0/2 - A * w10/w00;
- B = B+1;
- }
- else { /* essentially no difference between cycles;
- smoothing not needed */
- A= 0.0;
- B= 1.0;
- }
-
- /* create smoothed sequence */
-
- psseq=sseq+hl*ENH_BLOCKL;
- for (i=0; i<ENH_BLOCKL; i++) {
- odata[i]=A*surround[i]+B*psseq[i];
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * get the pitch-synchronous sample sequence
- *---------------------------------------------------------------*/
-
- void getsseq(
- float *sseq, /* (o) the pitch-synchronous sequence */
- float *idata, /* (i) original data */
- int idatal, /* (i) dimension of data */
- int centerStartPos, /* (i) where current block starts */
- float *period, /* (i) rough-pitch-period array */
- float *plocs, /* (i) where periods of period array
- are taken */
- int periodl, /* (i) dimension period array */
- int hl /* (i) 2*hl+1 is the number of sequences */
- ){
- int i,centerEndPos,q;
- float blockStartPos[2*ENH_HL+1];
- int lagBlock[2*ENH_HL+1];
- float plocs2[ENH_PLOCSL];
- float *psseq;
-
- centerEndPos=centerStartPos+ENH_BLOCKL-1;
-
- /* present */
-
- NearestNeighbor(lagBlock+hl,plocs,
- (float)0.5*(centerStartPos+centerEndPos),periodl);
-
- blockStartPos[hl]=(float)centerStartPos;
-
-
-
-
-
- psseq=sseq+ENH_BLOCKL*hl;
- memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float));
-
- /* past */
-
- for (q=hl-1; q>=0; q--) {
- blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]];
- NearestNeighbor(lagBlock+q,plocs,
- blockStartPos[q]+
- ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl);
-
-
- if (blockStartPos[q]-ENH_OVERHANG>=0) {
- refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata,
- idatal, centerStartPos, blockStartPos[q],
- period[lagBlock[q+1]]);
- } else {
- psseq=sseq+q*ENH_BLOCKL;
- memset(psseq, 0, ENH_BLOCKL*sizeof(float));
- }
- }
-
- /* future */
-
- for (i=0; i<periodl; i++) {
- plocs2[i]=plocs[i]-period[i];
- }
- for (q=hl+1; q<=2*hl; q++) {
- NearestNeighbor(lagBlock+q,plocs2,
- blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl);
-
- blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]];
- if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) {
- refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata,
- idatal, centerStartPos, blockStartPos[q],
- period[lagBlock[q]]);
- }
- else {
- psseq=sseq+q*ENH_BLOCKL;
- memset(psseq, 0, ENH_BLOCKL*sizeof(float));
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * perform enhancement on idata+centerStartPos through
- * idata+centerStartPos+ENH_BLOCKL-1
- *---------------------------------------------------------------*/
-
-
-
-
-
- void enhancer(
- float *odata, /* (o) smoothed block, dimension blockl */
- float *idata, /* (i) data buffer used for enhancing */
- int idatal, /* (i) dimension idata */
- int centerStartPos, /* (i) first sample current block
- within idata */
- float alpha0, /* (i) max correction-energy-fraction
- (in [0,1]) */
- float *period, /* (i) pitch period array */
- float *plocs, /* (i) locations where period array
- values valid */
- int periodl /* (i) dimension of period and plocs */
- ){
- float sseq[(2*ENH_HL+1)*ENH_BLOCKL];
-
- /* get said second sequence of segments */
-
- getsseq(sseq,idata,idatal,centerStartPos,period,
- plocs,periodl,ENH_HL);
-
- /* compute the smoothed output from said second sequence */
-
- smath(odata,sseq,ENH_HL,alpha0);
-
- }
-
- /*----------------------------------------------------------------*
- * cross correlation
- *---------------------------------------------------------------*/
-
- float xCorrCoef(
- float *target, /* (i) first array */
- float *regressor, /* (i) second array */
- int subl /* (i) dimension arrays */
- ){
- int i;
- float ftmp1, ftmp2;
-
- ftmp1 = 0.0;
- ftmp2 = 0.0;
- for (i=0; i<subl; i++) {
- ftmp1 += target[i]*regressor[i];
- ftmp2 += regressor[i]*regressor[i];
- }
-
- if (ftmp1 > 0.0) {
- return (float)(ftmp1*ftmp1/ftmp2);
- }
-
-
-
-
-
- else {
- return (float)0.0;
- }
- }
-
- /*----------------------------------------------------------------*
- * interface for enhancer
- *---------------------------------------------------------------*/
-
- int enhancerInterface(
- float *out, /* (o) enhanced signal */
- float *in, /* (i) unenhanced signal */
- iLBC_Dec_Inst_t *iLBCdec_inst /* (i) buffers etc */
- ){
- float *enh_buf, *enh_period;
- int iblock, isample;
- int lag=0, ilag, i, ioffset;
- float cc, maxcc;
- float ftmp1, ftmp2;
- float *inPtr, *enh_bufPtr1, *enh_bufPtr2;
- float plc_pred[ENH_BLOCKL];
-
- float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2];
- int inLen=ENH_NBLOCKS*ENH_BLOCKL+120;
- int start, plc_blockl, inlag;
-
- enh_buf=iLBCdec_inst->enh_buf;
- enh_period=iLBCdec_inst->enh_period;
-
- memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl],
- (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float));
-
- memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in,
- iLBCdec_inst->blockl*sizeof(float));
-
- if (iLBCdec_inst->mode==30)
- plc_blockl=ENH_BLOCKL;
- else
- plc_blockl=40;
-
- /* when 20 ms frame, move processing one block */
- ioffset=0;
- if (iLBCdec_inst->mode==20) ioffset=1;
-
- i=3-ioffset;
- memmove(enh_period, &enh_period[i],
- (ENH_NBLOCKS_TOT-i)*sizeof(float));
-
-
-
-
-
-
- /* Set state information to the 6 samples right before
- the samples to be downsampled. */
-
- memcpy(lpState,
- enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126,
- 6*sizeof(float));
-
- /* Down sample a factor 2 to save computations */
-
- DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120,
- lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL,
- lpState, downsampled);
-
- /* Estimate the pitch in the down sampled domain. */
- for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) {
-
- lag = 10;
- maxcc = xCorrCoef(downsampled+60+iblock*
- ENH_BLOCKL_HALF, downsampled+60+iblock*
- ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF);
- for (ilag=11; ilag<60; ilag++) {
- cc = xCorrCoef(downsampled+60+iblock*
- ENH_BLOCKL_HALF, downsampled+60+iblock*
- ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF);
-
- if (cc > maxcc) {
- maxcc = cc;
- lag = ilag;
- }
- }
-
- /* Store the estimated lag in the non-downsampled domain */
- enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2;
-
-
- }
-
-
- /* PLC was performed on the previous packet */
- if (iLBCdec_inst->prev_enh_pl==1) {
-
- inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset];
-
- lag = inlag-1;
- maxcc = xCorrCoef(in, in+lag, plc_blockl);
- for (ilag=inlag; ilag<=inlag+1; ilag++) {
- cc = xCorrCoef(in, in+ilag, plc_blockl);
-
-
-
-
-
-
- if (cc > maxcc) {
- maxcc = cc;
- lag = ilag;
- }
- }
-
- enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag;
-
- /* compute new concealed residual for the old lookahead,
- mix the forward PLC with a backward PLC from
- the new frame */
-
- inPtr=&in[lag-1];
-
- enh_bufPtr1=&plc_pred[plc_blockl-1];
-
- if (lag>plc_blockl) {
- start=plc_blockl;
- } else {
- start=lag;
- }
-
- for (isample = start; isample>0; isample--) {
- *enh_bufPtr1-- = *inPtr--;
- }
-
- enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
- for (isample = (plc_blockl-1-lag); isample>=0; isample--) {
- *enh_bufPtr1-- = *enh_bufPtr2--;
- }
-
- /* limit energy change */
- ftmp2=0.0;
- ftmp1=0.0;
- for (i=0;i<plc_blockl;i++) {
- ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]*
- enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i];
- ftmp1+=plc_pred[i]*plc_pred[i];
- }
- ftmp1=(float)sqrt(ftmp1/(float)plc_blockl);
- ftmp2=(float)sqrt(ftmp2/(float)plc_blockl);
- if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) {
- for (i=0;i<plc_blockl-10;i++) {
- plc_pred[i]*=(float)2.0*ftmp2/ftmp1;
- }
- for (i=plc_blockl-10;i<plc_blockl;i++) {
- plc_pred[i]*=(float)(i-plc_blockl+10)*
- ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+
-
-
-
-
-
- (float)2.0*ftmp2/ftmp1;
- }
- }
-
- enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
- for (i=0; i<plc_blockl; i++) {
- ftmp1 = (float) (i+1) / (float) (plc_blockl+1);
- *enh_bufPtr1 *= ftmp1;
- *enh_bufPtr1 += ((float)1.0-ftmp1)*
- plc_pred[plc_blockl-1-i];
- enh_bufPtr1--;
- }
- }
-
- if (iLBCdec_inst->mode==20) {
- /* Enhancer with 40 samples delay */
- for (iblock = 0; iblock<2; iblock++) {
- enhancer(out+iblock*ENH_BLOCKL, enh_buf,
- ENH_BUFL, (5+iblock)*ENH_BLOCKL+40,
- ENH_ALPHA0, enh_period, enh_plocsTbl,
- ENH_NBLOCKS_TOT);
- }
- } else if (iLBCdec_inst->mode==30) {
- /* Enhancer with 80 samples delay */
- for (iblock = 0; iblock<3; iblock++) {
- enhancer(out+iblock*ENH_BLOCKL, enh_buf,
- ENH_BUFL, (4+iblock)*ENH_BLOCKL,
- ENH_ALPHA0, enh_period, enh_plocsTbl,
- ENH_NBLOCKS_TOT);
- }
- }
-
- return (lag*2);
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/enhancer.h b/sflphone-common/libs/pjproject/third_party/ilbc/enhancer.h
deleted file mode 100644
index 8a081fb1bc21934a883a34398a531a7a37cc3caa..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/enhancer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- enhancer.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
-
-
-
-
- ******************************************************************/
-
- #ifndef __ENHANCER_H
- #define __ENHANCER_H
-
- #include "iLBC_define.h"
-
- float xCorrCoef(
- float *target, /* (i) first array */
- float *regressor, /* (i) second array */
- int subl /* (i) dimension arrays */
- );
-
- int enhancerInterface(
- float *out, /* (o) the enhanced recidual signal */
- float *in, /* (i) the recidual signal to enhance */
- iLBC_Dec_Inst_t *iLBCdec_inst
- /* (i/o) the decoder state structure */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/filter.c b/sflphone-common/libs/pjproject/third_party/ilbc/filter.c
deleted file mode 100644
index 6565c2beee0ccfac27f6cdf92a81272982b9dffb..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/filter.c
+++ /dev/null
@@ -1,175 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- filter.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include "iLBC_define.h"
-
- /*----------------------------------------------------------------*
- * all-pole filter
- *---------------------------------------------------------------*/
-
- void AllPoleFilter(
- float *InOut, /* (i/o) on entrance InOut[-orderCoef] to
- InOut[-1] contain the state of the
- filter (delayed samples). InOut[0] to
- InOut[lengthInOut-1] contain the filter
- input, on en exit InOut[-orderCoef] to
- InOut[-1] is unchanged and InOut[0] to
- InOut[lengthInOut-1] contain filtered
- samples */
- float *Coef,/* (i) filter coefficients, Coef[0] is assumed
- to be 1.0 */
- int lengthInOut,/* (i) number of input/output samples */
- int orderCoef /* (i) number of filter coefficients */
- ){
- int n,k;
-
- for(n=0;n<lengthInOut;n++){
- for(k=1;k<=orderCoef;k++){
- *InOut -= Coef[k]*InOut[-k];
-
-
-
-
-
- }
- InOut++;
- }
- }
-
- /*----------------------------------------------------------------*
- * all-zero filter
- *---------------------------------------------------------------*/
-
- void AllZeroFilter(
- float *In, /* (i) In[0] to In[lengthInOut-1] contain
- filter input samples */
- float *Coef,/* (i) filter coefficients (Coef[0] is assumed
- to be 1.0) */
- int lengthInOut,/* (i) number of input/output samples */
- int orderCoef, /* (i) number of filter coefficients */
- float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1]
- contain the filter state, on exit Out[0]
- to Out[lengthInOut-1] contain filtered
- samples */
- ){
- int n,k;
-
- for(n=0;n<lengthInOut;n++){
- *Out = Coef[0]*In[0];
- for(k=1;k<=orderCoef;k++){
- *Out += Coef[k]*In[-k];
- }
- Out++;
- In++;
- }
- }
-
- /*----------------------------------------------------------------*
- * pole-zero filter
- *---------------------------------------------------------------*/
-
- void ZeroPoleFilter(
- float *In, /* (i) In[0] to In[lengthInOut-1] contain
- filter input samples In[-orderCoef] to
- In[-1] contain state of all-zero
- section */
- float *ZeroCoef,/* (i) filter coefficients for all-zero
- section (ZeroCoef[0] is assumed to
- be 1.0) */
- float *PoleCoef,/* (i) filter coefficients for all-pole section
- (ZeroCoef[0] is assumed to be 1.0) */
- int lengthInOut,/* (i) number of input/output samples */
-
-
-
-
-
- int orderCoef, /* (i) number of filter coefficients */
- float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1]
- contain state of all-pole section. On
- exit Out[0] to Out[lengthInOut-1]
- contain filtered samples */
- ){
- AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
- AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
- }
-
- /*----------------------------------------------------------------*
- * downsample (LP filter and decimation)
- *---------------------------------------------------------------*/
-
- void DownSample (
- float *In, /* (i) input samples */
- float *Coef, /* (i) filter coefficients */
- int lengthIn, /* (i) number of input samples */
- float *state, /* (i) filter state */
- float *Out /* (o) downsampled output */
- ){
- float o;
- float *Out_ptr = Out;
- float *Coef_ptr, *In_ptr;
- float *state_ptr;
- int i, j, stop;
-
- /* LP filter and decimate at the same time */
-
- for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS)
- {
- Coef_ptr = &Coef[0];
- In_ptr = &In[i];
- state_ptr = &state[FILTERORDER_DS-2];
-
- o = (float)0.0;
-
- stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS;
-
- for (j = 0; j < stop; j++)
- {
- o += *Coef_ptr++ * (*In_ptr--);
- }
- for (j = i + 1; j < FILTERORDER_DS; j++)
- {
- o += *Coef_ptr++ * (*state_ptr--);
- }
-
-
-
-
-
-
- *Out_ptr++ = o;
- }
-
- /* Get the last part (use zeros as input for the future) */
-
- for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS);
- i+=FACTOR_DS) {
-
- o=(float)0.0;
-
- if (i<lengthIn) {
- Coef_ptr = &Coef[0];
- In_ptr = &In[i];
- for (j=0; j<FILTERORDER_DS; j++) {
- o += *Coef_ptr++ * (*Out_ptr--);
- }
- } else {
- Coef_ptr = &Coef[i-lengthIn];
- In_ptr = &In[lengthIn-1];
- for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) {
- o += *Coef_ptr++ * (*In_ptr--);
- }
- }
- *Out_ptr++ = o;
- }
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/filter.h b/sflphone-common/libs/pjproject/third_party/ilbc/filter.h
deleted file mode 100644
index 4c512cd9376beb643234893f840467927d53c1ae..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/filter.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- filter.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
-
-
-
-
-
- #ifndef __iLBC_FILTER_H
- #define __iLBC_FILTER_H
-
- void AllPoleFilter(
- float *InOut, /* (i/o) on entrance InOut[-orderCoef] to
- InOut[-1] contain the state of the
- filter (delayed samples). InOut[0] to
- InOut[lengthInOut-1] contain the filter
- input, on en exit InOut[-orderCoef] to
- InOut[-1] is unchanged and InOut[0] to
- InOut[lengthInOut-1] contain filtered
- samples */
- float *Coef,/* (i) filter coefficients, Coef[0] is assumed
- to be 1.0 */
- int lengthInOut,/* (i) number of input/output samples */
- int orderCoef /* (i) number of filter coefficients */
- );
-
- void AllZeroFilter(
- float *In, /* (i) In[0] to In[lengthInOut-1] contain
- filter input samples */
- float *Coef,/* (i) filter coefficients (Coef[0] is assumed
- to be 1.0) */
- int lengthInOut,/* (i) number of input/output samples */
- int orderCoef, /* (i) number of filter coefficients */
- float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1]
- contain the filter state, on exit Out[0]
- to Out[lengthInOut-1] contain filtered
- samples */
- );
-
- void ZeroPoleFilter(
- float *In, /* (i) In[0] to In[lengthInOut-1] contain filter
- input samples In[-orderCoef] to In[-1]
- contain state of all-zero section */
- float *ZeroCoef,/* (i) filter coefficients for all-zero
- section (ZeroCoef[0] is assumed to
- be 1.0) */
- float *PoleCoef,/* (i) filter coefficients for all-pole section
- (ZeroCoef[0] is assumed to be 1.0) */
- int lengthInOut,/* (i) number of input/output samples */
- int orderCoef, /* (i) number of filter coefficients */
- float *Out /* (i/o) on entrance Out[-orderCoef] to Out[-1]
- contain state of all-pole section. On
- exit Out[0] to Out[lengthInOut-1]
- contain filtered samples */
- );
-
-
-
-
-
-
- void DownSample (
- float *In, /* (i) input samples */
- float *Coef, /* (i) filter coefficients */
- int lengthIn, /* (i) number of input samples */
- float *state, /* (i) filter state */
- float *Out /* (o) downsampled output */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/gainquant.c b/sflphone-common/libs/pjproject/third_party/ilbc/gainquant.c
deleted file mode 100644
index 0e74ff827050bc56fd50755ce31944c92e319ad2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/gainquant.c
+++ /dev/null
@@ -1,116 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
-
-
-
-
-
- gainquant.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <string.h>
- #include <math.h>
- #include "constants.h"
- #include "filter.h"
-
- /*----------------------------------------------------------------*
- * quantizer for the gain in the gain-shape coding of residual
- *---------------------------------------------------------------*/
-
- float gainquant(/* (o) quantized gain value */
- float in, /* (i) gain value */
- float maxIn,/* (i) maximum of gain value */
- int cblen, /* (i) number of quantization indices */
- int *index /* (o) quantization index */
- ){
- int i, tindex;
- float minmeasure,measure, *cb, scale;
-
- /* ensure a lower bound on the scaling factor */
-
- scale=maxIn;
-
- if (scale<0.1) {
- scale=(float)0.1;
- }
-
- /* select the quantization table */
-
- if (cblen == 8) {
- cb = gain_sq3Tbl;
- } else if (cblen == 16) {
- cb = gain_sq4Tbl;
- } else {
- cb = gain_sq5Tbl;
- }
-
- /* select the best index in the quantization table */
-
- minmeasure=10000000.0;
- tindex=0;
- for (i=0; i<cblen; i++) {
-
-
-
-
-
- measure=(in-scale*cb[i])*(in-scale*cb[i]);
-
- if (measure<minmeasure) {
- tindex=i;
- minmeasure=measure;
- }
- }
- *index=tindex;
-
- /* return the quantized value */
-
- return scale*cb[tindex];
- }
-
- /*----------------------------------------------------------------*
- * decoder for quantized gains in the gain-shape coding of
- * residual
- *---------------------------------------------------------------*/
-
- float gaindequant( /* (o) quantized gain value */
- int index, /* (i) quantization index */
- float maxIn,/* (i) maximum of unquantized gain */
- int cblen /* (i) number of quantization indices */
- ){
- float scale;
-
- /* obtain correct scale factor */
-
- scale=(float)fabs(maxIn);
-
- if (scale<0.1) {
- scale=(float)0.1;
- }
-
- /* select the quantization table and return the decoded value */
-
- if (cblen==8) {
- return scale*gain_sq3Tbl[index];
- } else if (cblen==16) {
- return scale*gain_sq4Tbl[index];
- }
- else if (cblen==32) {
- return scale*gain_sq5Tbl[index];
- }
-
- return 0.0;
- }
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/gainquant.h b/sflphone-common/libs/pjproject/third_party/ilbc/gainquant.h
deleted file mode 100644
index 0d024246d7d38bc3e5d495a9b19720bce27aa073..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/gainquant.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- gainquant.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_GAINQUANT_H
- #define __iLBC_GAINQUANT_H
-
- float gainquant(/* (o) quantized gain value */
- float in, /* (i) gain value */
- float maxIn,/* (i) maximum of gain value */
- int cblen, /* (i) number of quantization indices */
- int *index /* (o) quantization index */
- );
-
- float gaindequant( /* (o) quantized gain value */
- int index, /* (i) quantization index */
- float maxIn,/* (i) maximum of unquantized gain */
- int cblen /* (i) number of quantization indices */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/getCBvec.c b/sflphone-common/libs/pjproject/third_party/ilbc/getCBvec.c
deleted file mode 100644
index 4f2d291417505de51e3d1db92b384a045f9b9bb7..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/getCBvec.c
+++ /dev/null
@@ -1,193 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- getCBvec.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include "iLBC_define.h"
- #include "constants.h"
- #include <string.h>
-
- /*----------------------------------------------------------------*
- * Construct codebook vector for given index.
- *---------------------------------------------------------------*/
-
- void getCBvec(
-
-
-
-
-
- float *cbvec, /* (o) Constructed codebook vector */
- float *mem, /* (i) Codebook buffer */
- int index, /* (i) Codebook index */
- int lMem, /* (i) Length of codebook buffer */
- int cbveclen/* (i) Codebook vector length */
- ){
- int j, k, n, memInd, sFilt;
- float tmpbuf[CB_MEML];
- int base_size;
- int ilow, ihigh;
- float alfa, alfa1;
-
- /* Determine size of codebook sections */
-
- base_size=lMem-cbveclen+1;
-
- if (cbveclen==SUBL) {
- base_size+=cbveclen/2;
- }
-
- /* No filter -> First codebook section */
-
- if (index<lMem-cbveclen+1) {
-
- /* first non-interpolated vectors */
-
- k=index+cbveclen;
- /* get vector */
- memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float));
-
- } else if (index < base_size) {
-
- k=2*(index-(lMem-cbveclen+1))+cbveclen;
-
- ihigh=k/2;
- ilow=ihigh-5;
-
- /* Copy first noninterpolated part */
-
- memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float));
-
- /* interpolation */
-
- alfa1=(float)0.2;
- alfa=0.0;
- for (j=ilow; j<ihigh; j++) {
- cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+
- alfa*mem[lMem-k+j];
-
-
-
-
-
- alfa+=alfa1;
- }
-
- /* Copy second noninterpolated part */
-
- memcpy(cbvec+ihigh, mem+lMem-k+ihigh,
- (cbveclen-ihigh)*sizeof(float));
-
- }
-
- /* Higher codebook section based on filtering */
-
- else {
-
- /* first non-interpolated vectors */
-
- if (index-base_size<lMem-cbveclen+1) {
- float tempbuff2[CB_MEML+CB_FILTERLEN+1];
- float *pos;
- float *pp, *pp1;
-
- memset(tempbuff2, 0,
- CB_HALFFILTERLEN*sizeof(float));
- memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
- lMem*sizeof(float));
- memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
- (CB_HALFFILTERLEN+1)*sizeof(float));
-
- k=index-base_size+cbveclen;
- sFilt=lMem-k;
- memInd=sFilt+1-CB_HALFFILTERLEN;
-
- /* do filtering */
- pos=cbvec;
- memset(pos, 0, cbveclen*sizeof(float));
- for (n=0; n<cbveclen; n++) {
- pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN];
- pp1=&cbfiltersTbl[CB_FILTERLEN-1];
- for (j=0; j<CB_FILTERLEN; j++) {
- (*pos)+=(*pp++)*(*pp1--);
- }
- pos++;
- }
- }
-
- /* interpolated vectors */
-
- else {
-
-
-
-
-
- float tempbuff2[CB_MEML+CB_FILTERLEN+1];
-
- float *pos;
- float *pp, *pp1;
- int i;
-
- memset(tempbuff2, 0,
- CB_HALFFILTERLEN*sizeof(float));
- memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
- lMem*sizeof(float));
- memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
- (CB_HALFFILTERLEN+1)*sizeof(float));
-
- k=2*(index-base_size-
- (lMem-cbveclen+1))+cbveclen;
- sFilt=lMem-k;
- memInd=sFilt+1-CB_HALFFILTERLEN;
-
- /* do filtering */
- pos=&tmpbuf[sFilt];
- memset(pos, 0, k*sizeof(float));
- for (i=0; i<k; i++) {
- pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN];
- pp1=&cbfiltersTbl[CB_FILTERLEN-1];
- for (j=0; j<CB_FILTERLEN; j++) {
- (*pos)+=(*pp++)*(*pp1--);
- }
- pos++;
- }
-
- ihigh=k/2;
- ilow=ihigh-5;
-
- /* Copy first noninterpolated part */
-
- memcpy(cbvec, tmpbuf+lMem-k/2,
- ilow*sizeof(float));
-
- /* interpolation */
-
- alfa1=(float)0.2;
- alfa=0.0;
- for (j=ilow; j<ihigh; j++) {
- cbvec[j]=((float)1.0-alfa)*
- tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j];
- alfa+=alfa1;
- }
-
-
-
-
-
-
- /* Copy second noninterpolated part */
-
- memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh,
- (cbveclen-ihigh)*sizeof(float));
- }
- }
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/getCBvec.h b/sflphone-common/libs/pjproject/third_party/ilbc/getCBvec.h
deleted file mode 100644
index 0080907c02ec39f6bb21578fdb884499ce217d3e..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/getCBvec.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- getCBvec.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_GETCBVEC_H
- #define __iLBC_GETCBVEC_H
-
- void getCBvec(
- float *cbvec, /* (o) Constructed codebook vector */
- float *mem, /* (i) Codebook buffer */
- int index, /* (i) Codebook index */
- int lMem, /* (i) Length of codebook buffer */
- int cbveclen/* (i) Codebook vector length */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/helpfun.c b/sflphone-common/libs/pjproject/third_party/ilbc/helpfun.c
deleted file mode 100644
index 1aba65788f0deb2d3a22d231ba44d792151a6c95..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/helpfun.c
+++ /dev/null
@@ -1,326 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- helpfun.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
-
- #include "iLBC_define.h"
- #include "constants.h"
-
- /*----------------------------------------------------------------*
- * calculation of auto correlation
- *---------------------------------------------------------------*/
-
- void autocorr(
- float *r, /* (o) autocorrelation vector */
- const float *x, /* (i) data vector */
- int N, /* (i) length of data vector */
- int order /* largest lag for calculated
- autocorrelations */
- ){
- int lag, n;
- float sum;
-
- for (lag = 0; lag <= order; lag++) {
- sum = 0;
- for (n = 0; n < N - lag; n++) {
- sum += x[n] * x[n+lag];
- }
- r[lag] = sum;
- }
-
-
-
-
-
- }
-
- /*----------------------------------------------------------------*
- * window multiplication
- *---------------------------------------------------------------*/
-
- void window(
- float *z, /* (o) the windowed data */
- const float *x, /* (i) the original data vector */
- const float *y, /* (i) the window */
- int N /* (i) length of all vectors */
- ){
- int i;
-
- for (i = 0; i < N; i++) {
- z[i] = x[i] * y[i];
- }
- }
-
- /*----------------------------------------------------------------*
- * levinson-durbin solution for lpc coefficients
- *---------------------------------------------------------------*/
-
- void levdurb(
- float *a, /* (o) lpc coefficient vector starting
- with 1.0 */
- float *k, /* (o) reflection coefficients */
- float *r, /* (i) autocorrelation vector */
- int order /* (i) order of lpc filter */
- ){
- float sum, alpha;
- int m, m_h, i;
-
- a[0] = 1.0;
-
- if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
- for (i = 0; i < order; i++) {
- k[i] = 0;
- a[i+1] = 0;
- }
- } else {
- a[1] = k[0] = -r[1]/r[0];
- alpha = r[0] + r[1] * k[0];
- for (m = 1; m < order; m++){
- sum = r[m + 1];
- for (i = 0; i < m; i++){
- sum += a[i+1] * r[m - i];
- }
-
-
-
-
-
- k[m] = -sum / alpha;
- alpha += k[m] * sum;
- m_h = (m + 1) >> 1;
- for (i = 0; i < m_h; i++){
- sum = a[i+1] + k[m] * a[m - i];
- a[m - i] += k[m] * a[i+1];
- a[i+1] = sum;
- }
- a[m+1] = k[m];
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * interpolation between vectors
- *---------------------------------------------------------------*/
-
- void interpolate(
- float *out, /* (o) the interpolated vector */
- float *in1, /* (i) the first vector for the
- interpolation */
- float *in2, /* (i) the second vector for the
- interpolation */
- float coef, /* (i) interpolation weights */
- int length /* (i) length of all vectors */
- ){
- int i;
- float invcoef;
-
- invcoef = (float)1.0 - coef;
- for (i = 0; i < length; i++) {
- out[i] = coef * in1[i] + invcoef * in2[i];
- }
- }
-
- /*----------------------------------------------------------------*
- * lpc bandwidth expansion
- *---------------------------------------------------------------*/
-
- void bwexpand(
- float *out, /* (o) the bandwidth expanded lpc
- coefficients */
- float *in, /* (i) the lpc coefficients before bandwidth
- expansion */
- float coef, /* (i) the bandwidth expansion factor */
- int length /* (i) the length of lpc coefficient vectors */
- ){
- int i;
-
-
-
-
-
- float chirp;
-
- chirp = coef;
-
- out[0] = in[0];
- for (i = 1; i < length; i++) {
- out[i] = chirp * in[i];
- chirp *= coef;
- }
- }
-
- /*----------------------------------------------------------------*
- * vector quantization
- *---------------------------------------------------------------*/
-
- void vq(
- float *Xq, /* (o) the quantized vector */
- int *index, /* (o) the quantization index */
- const float *CB,/* (i) the vector quantization codebook */
- float *X, /* (i) the vector to quantize */
- int n_cb, /* (i) the number of vectors in the codebook */
- int dim /* (i) the dimension of all vectors */
- ){
- int i, j;
- int pos, minindex;
- float dist, tmp, mindist;
-
- pos = 0;
- mindist = FLOAT_MAX;
- minindex = 0;
- for (j = 0; j < n_cb; j++) {
- dist = X[0] - CB[pos];
- dist *= dist;
- for (i = 1; i < dim; i++) {
- tmp = X[i] - CB[pos + i];
- dist += tmp*tmp;
- }
-
- if (dist < mindist) {
- mindist = dist;
- minindex = j;
- }
- pos += dim;
- }
- for (i = 0; i < dim; i++) {
- Xq[i] = CB[minindex*dim + i];
- }
- *index = minindex;
-
-
-
-
-
- }
-
- /*----------------------------------------------------------------*
- * split vector quantization
- *---------------------------------------------------------------*/
-
- void SplitVQ(
- float *qX, /* (o) the quantized vector */
- int *index, /* (o) a vector of indexes for all vector
- codebooks in the split */
- float *X, /* (i) the vector to quantize */
- const float *CB,/* (i) the quantizer codebook */
- int nsplit, /* the number of vector splits */
- const int *dim, /* the dimension of X and qX */
- const int *cbsize /* the number of vectors in the codebook */
- ){
- int cb_pos, X_pos, i;
-
- cb_pos = 0;
- X_pos= 0;
- for (i = 0; i < nsplit; i++) {
- vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos,
- cbsize[i], dim[i]);
- X_pos += dim[i];
- cb_pos += dim[i] * cbsize[i];
- }
- }
-
- /*----------------------------------------------------------------*
- * scalar quantization
- *---------------------------------------------------------------*/
-
- void sort_sq(
- float *xq, /* (o) the quantized value */
- int *index, /* (o) the quantization index */
- float x, /* (i) the value to quantize */
- const float *cb,/* (i) the quantization codebook */
- int cb_size /* (i) the size of the quantization codebook */
- ){
- int i;
-
- if (x <= cb[0]) {
- *index = 0;
- *xq = cb[0];
- } else {
- i = 0;
- while ((x > cb[i]) && i < cb_size - 1) {
- i++;
-
-
-
-
-
- }
-
- if (x > ((cb[i] + cb[i - 1])/2)) {
- *index = i;
- *xq = cb[i];
- } else {
- *index = i - 1;
- *xq = cb[i - 1];
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * check for stability of lsf coefficients
- *---------------------------------------------------------------*/
-
- int LSF_check( /* (o) 1 for stable lsf vectors and 0 for
- nonstable ones */
- float *lsf, /* (i) a table of lsf vectors */
- int dim, /* (i) the dimension of each lsf vector */
- int NoAn /* (i) the number of lsf vectors in the
- table */
- ){
- int k,n,m, Nit=2, change=0,pos;
- float tmp;
- static float eps=(float)0.039; /* 50 Hz */
- static float eps2=(float)0.0195;
- static float maxlsf=(float)3.14; /* 4000 Hz */
- static float minlsf=(float)0.01; /* 0 Hz */
-
- /* LSF separation check*/
-
- for (n=0; n<Nit; n++) { /* Run through a couple of times */
- for (m=0; m<NoAn; m++) { /* Number of analyses per frame */
- for (k=0; k<(dim-1); k++) {
- pos=m*dim+k;
-
- if ((lsf[pos+1]-lsf[pos])<eps) {
-
- if (lsf[pos+1]<lsf[pos]) {
- tmp=lsf[pos+1];
- lsf[pos+1]= lsf[pos]+eps2;
- lsf[pos]= lsf[pos+1]-eps2;
- } else {
- lsf[pos]-=eps2;
- lsf[pos+1]+=eps2;
- }
- change=1;
-
-
-
-
-
- }
-
- if (lsf[pos]<minlsf) {
- lsf[pos]=minlsf;
- change=1;
- }
-
- if (lsf[pos]>maxlsf) {
- lsf[pos]=maxlsf;
- change=1;
- }
- }
- }
- }
-
- return change;
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/helpfun.h b/sflphone-common/libs/pjproject/third_party/ilbc/helpfun.h
deleted file mode 100644
index 931ca68a64da2705c6669c1f985ca5183287e0dd..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/helpfun.h
+++ /dev/null
@@ -1,106 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- helpfun.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_HELPFUN_H
- #define __iLBC_HELPFUN_H
-
- void autocorr(
- float *r, /* (o) autocorrelation vector */
- const float *x, /* (i) data vector */
- int N, /* (i) length of data vector */
- int order /* largest lag for calculated
- autocorrelations */
- );
-
- void window(
- float *z, /* (o) the windowed data */
- const float *x, /* (i) the original data vector */
- const float *y, /* (i) the window */
- int N /* (i) length of all vectors */
- );
-
- void levdurb(
- float *a, /* (o) lpc coefficient vector starting
- with 1.0 */
- float *k, /* (o) reflection coefficients */
- float *r, /* (i) autocorrelation vector */
- int order /* (i) order of lpc filter */
- );
-
- void interpolate(
-
-
-
-
-
- float *out, /* (o) the interpolated vector */
- float *in1, /* (i) the first vector for the
- interpolation */
- float *in2, /* (i) the second vector for the
- interpolation */
- float coef, /* (i) interpolation weights */
- int length /* (i) length of all vectors */
- );
-
- void bwexpand(
- float *out, /* (o) the bandwidth expanded lpc
- coefficients */
- float *in, /* (i) the lpc coefficients before bandwidth
- expansion */
- float coef, /* (i) the bandwidth expansion factor */
- int length /* (i) the length of lpc coefficient vectors */
- );
-
- void vq(
- float *Xq, /* (o) the quantized vector */
- int *index, /* (o) the quantization index */
- const float *CB,/* (i) the vector quantization codebook */
- float *X, /* (i) the vector to quantize */
- int n_cb, /* (i) the number of vectors in the codebook */
- int dim /* (i) the dimension of all vectors */
- );
-
- void SplitVQ(
- float *qX, /* (o) the quantized vector */
- int *index, /* (o) a vector of indexes for all vector
- codebooks in the split */
- float *X, /* (i) the vector to quantize */
- const float *CB,/* (i) the quantizer codebook */
- int nsplit, /* the number of vector splits */
- const int *dim, /* the dimension of X and qX */
- const int *cbsize /* the number of vectors in the codebook */
- );
-
-
- void sort_sq(
- float *xq, /* (o) the quantized value */
- int *index, /* (o) the quantization index */
- float x, /* (i) the value to quantize */
- const float *cb,/* (i) the quantization codebook */
- int cb_size /* (i) the size of the quantization codebook */
- );
-
- int LSF_check( /* (o) 1 for stable lsf vectors and 0 for
-
-
-
-
-
- nonstable ones */
- float *lsf, /* (i) a table of lsf vectors */
- int dim, /* (i) the dimension of each lsf vector */
- int NoAn /* (i) the number of lsf vectors in the
- table */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/hpInput.c b/sflphone-common/libs/pjproject/third_party/ilbc/hpInput.c
deleted file mode 100644
index 7ceee09643715f91229629f87fb65ca8717e8bf4..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/hpInput.c
+++ /dev/null
@@ -1,65 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
-
-
-
-
- hpInput.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include "constants.h"
-
- /*----------------------------------------------------------------*
- * Input high-pass filter
- *---------------------------------------------------------------*/
-
- void hpInput(
- float *In, /* (i) vector to filter */
- int len, /* (i) length of vector to filter */
- float *Out, /* (o) the resulting filtered vector */
- float *mem /* (i/o) the filter state */
- ){
- int i;
- float *pi, *po;
-
- /* all-zero section*/
-
- pi = &In[0];
- po = &Out[0];
- for (i=0; i<len; i++) {
- *po = hpi_zero_coefsTbl[0] * (*pi);
- *po += hpi_zero_coefsTbl[1] * mem[0];
- *po += hpi_zero_coefsTbl[2] * mem[1];
-
- mem[1] = mem[0];
- mem[0] = *pi;
- po++;
- pi++;
-
- }
-
- /* all-pole section*/
-
- po = &Out[0];
- for (i=0; i<len; i++) {
- *po -= hpi_pole_coefsTbl[1] * mem[2];
- *po -= hpi_pole_coefsTbl[2] * mem[3];
-
- mem[3] = mem[2];
- mem[2] = *po;
- po++;
-
-
-
-
-
- }
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/hpInput.h b/sflphone-common/libs/pjproject/third_party/ilbc/hpInput.h
deleted file mode 100644
index 3b020d11df050e976cf2044fc1ce3a1beddcefa9..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/hpInput.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- hpInput.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_HPINPUT_H
- #define __iLBC_HPINPUT_H
-
- void hpInput(
- float *In, /* (i) vector to filter */
- int len, /* (i) length of vector to filter */
- float *Out, /* (o) the resulting filtered vector */
- float *mem /* (i/o) the filter state */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.c b/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.c
deleted file mode 100644
index 756160a657f9c0fa36ae28279db67a8263b4275f..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.c
+++ /dev/null
@@ -1,61 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- hpOutput.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include "constants.h"
-
- /*----------------------------------------------------------------*
- * Output high-pass filter
- *---------------------------------------------------------------*/
-
- void hpOutput(
-
-
-
-
-
- float *In, /* (i) vector to filter */
- int len,/* (i) length of vector to filter */
- float *Out, /* (o) the resulting filtered vector */
- float *mem /* (i/o) the filter state */
- ){
- int i;
- float *pi, *po;
-
- /* all-zero section*/
-
- pi = &In[0];
- po = &Out[0];
- for (i=0; i<len; i++) {
- *po = hpo_zero_coefsTbl[0] * (*pi);
- *po += hpo_zero_coefsTbl[1] * mem[0];
- *po += hpo_zero_coefsTbl[2] * mem[1];
-
- mem[1] = mem[0];
- mem[0] = *pi;
- po++;
- pi++;
-
- }
-
- /* all-pole section*/
-
- po = &Out[0];
- for (i=0; i<len; i++) {
- *po -= hpo_pole_coefsTbl[1] * mem[2];
- *po -= hpo_pole_coefsTbl[2] * mem[3];
-
- mem[3] = mem[2];
- mem[2] = *po;
- po++;
- }
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.h b/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.h
deleted file mode 100644
index b213a19348ef39bfe6d718971dc0f9f61e65ca01..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/hpOutput.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- hpOutput.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_HPOUTPUT_H
- #define __iLBC_HPOUTPUT_H
-
- void hpOutput(
- float *In, /* (i) vector to filter */
- int len,/* (i) length of vector to filter */
- float *Out, /* (o) the resulting filtered vector */
- float *mem /* (i/o) the filter state */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.c b/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.c
deleted file mode 100644
index ee9a73ca5896b687562181176fc16b4cd45c4eb5..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.c
+++ /dev/null
@@ -1,112 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iCBConstruct.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
-
- #include "iLBC_define.h"
- #include "gainquant.h"
- #include "getCBvec.h"
-
- /*----------------------------------------------------------------*
- * Convert the codebook indexes to make the search easier
- *---------------------------------------------------------------*/
-
-
-
-
-
-
- void index_conv_enc(
- int *index /* (i/o) Codebook indexes */
- ){
- int k;
-
- for (k=1; k<CB_NSTAGES; k++) {
-
- if ((index[k]>=108)&&(index[k]<172)) {
- index[k]-=64;
- } else if (index[k]>=236) {
- index[k]-=128;
- } else {
- /* ERROR */
- }
- }
- }
-
- void index_conv_dec(
- int *index /* (i/o) Codebook indexes */
- ){
- int k;
-
- for (k=1; k<CB_NSTAGES; k++) {
-
- if ((index[k]>=44)&&(index[k]<108)) {
- index[k]+=64;
- } else if ((index[k]>=108)&&(index[k]<128)) {
- index[k]+=128;
- } else {
- /* ERROR */
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * Construct decoded vector from codebook and gains.
- *---------------------------------------------------------------*/
-
- void iCBConstruct(
- float *decvector, /* (o) Decoded vector */
- int *index, /* (i) Codebook indices */
- int *gain_index,/* (i) Gain quantization indices */
- float *mem, /* (i) Buffer for codevector construction */
- int lMem, /* (i) Length of buffer */
- int veclen, /* (i) Length of vector */
- int nStages /* (i) Number of codebook stages */
- ){
- int j,k;
-
-
-
-
-
- float gain[CB_NSTAGES];
- float cbvec[SUBL];
-
- /* gain de-quantization */
-
- gain[0] = gaindequant(gain_index[0], 1.0, 32);
- if (nStages > 1) {
- gain[1] = gaindequant(gain_index[1],
- (float)fabs(gain[0]), 16);
- }
- if (nStages > 2) {
- gain[2] = gaindequant(gain_index[2],
- (float)fabs(gain[1]), 8);
- }
-
- /* codebook vector construction and construction of
- total vector */
-
- getCBvec(cbvec, mem, index[0], lMem, veclen);
- for (j=0;j<veclen;j++){
- decvector[j] = gain[0]*cbvec[j];
- }
- if (nStages > 1) {
- for (k=1; k<nStages; k++) {
- getCBvec(cbvec, mem, index[k], lMem, veclen);
- for (j=0;j<veclen;j++) {
- decvector[j] += gain[k]*cbvec[j];
- }
- }
- }
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.h b/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.h
deleted file mode 100644
index 143501ed64787106eb384f34a841b97b7ab7b9c4..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBConstruct.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iCBConstruct.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
-
-
-
-
-
- ******************************************************************/
-
- #ifndef __iLBC_ICBCONSTRUCT_H
- #define __iLBC_ICBCONSTRUCT_H
-
- void index_conv_enc(
- int *index /* (i/o) Codebook indexes */
- );
-
- void index_conv_dec(
- int *index /* (i/o) Codebook indexes */
- );
-
- void iCBConstruct(
- float *decvector, /* (o) Decoded vector */
- int *index, /* (i) Codebook indices */
- int *gain_index,/* (i) Gain quantization indices */
- float *mem, /* (i) Buffer for codevector construction */
- int lMem, /* (i) Length of buffer */
- int veclen, /* (i) Length of vector */
- int nStages /* (i) Number of codebook stages */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.c b/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.c
deleted file mode 100644
index e0442bf0544f56820aa18927f49328abd05b3d9d..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.c
+++ /dev/null
@@ -1,515 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iCBSearch.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <string.h>
-
- #include "iLBC_define.h"
- #include "gainquant.h"
- #include "createCB.h"
- #include "filter.h"
- #include "constants.h"
-
- /*----------------------------------------------------------------*
- * Search routine for codebook encoding and gain quantization.
- *---------------------------------------------------------------*/
-
- void iCBSearch(
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i) the encoder state structure */
- int *index, /* (o) Codebook indices */
- int *gain_index,/* (o) Gain quantization indices */
-
-
-
-
-
- float *intarget,/* (i) Target vector for encoding */
- float *mem, /* (i) Buffer for codebook construction */
- int lMem, /* (i) Length of buffer */
- int lTarget, /* (i) Length of vector */
- int nStages, /* (i) Number of codebook stages */
- float *weightDenum, /* (i) weighting filter coefficients */
- float *weightState, /* (i) weighting filter state */
- int block /* (i) the sub-block number */
- ){
- int i, j, icount, stage, best_index, range, counter;
- float max_measure, gain, measure, crossDot, ftmp;
- float gains[CB_NSTAGES];
- float target[SUBL];
- int base_index, sInd, eInd, base_size;
- int sIndAug=0, eIndAug=0;
- float buf[CB_MEML+SUBL+2*LPC_FILTERORDER];
- float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128];
- float *pp, *ppi=0, *ppo=0, *ppe=0;
- float cbvectors[CB_MEML];
- float tene, cene, cvec[SUBL];
- float aug_vec[SUBL];
-
- memset(cvec,0,SUBL*sizeof(float));
-
- /* Determine size of codebook sections */
-
- base_size=lMem-lTarget+1;
-
- if (lTarget==SUBL) {
- base_size=lMem-lTarget+1+lTarget/2;
- }
-
- /* setup buffer for weighting */
-
- memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER);
- memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float));
- memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float));
-
- /* weighting */
-
- AllPoleFilter(buf+LPC_FILTERORDER, weightDenum,
- lMem+lTarget, LPC_FILTERORDER);
-
- /* Construct the codebook and target needed */
-
- memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float));
-
- tene=0.0;
-
-
-
-
-
- for (i=0; i<lTarget; i++) {
- tene+=target[i]*target[i];
- }
-
- /* Prepare search over one more codebook section. This section
- is created by filtering the original buffer with a filter. */
-
- filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem);
-
- /* The Main Loop over stages */
-
- for (stage=0; stage<nStages; stage++) {
-
- range = search_rangeTbl[block][stage];
-
- /* initialize search measure */
-
- max_measure = (float)-10000000.0;
- gain = (float)0.0;
- best_index = 0;
-
- /* Compute cross dot product between the target
- and the CB memory */
-
- crossDot=0.0;
- pp=buf+LPC_FILTERORDER+lMem-lTarget;
- for (j=0; j<lTarget; j++) {
- crossDot += target[j]*(*pp++);
- }
-
- if (stage==0) {
-
- /* Calculate energy in the first block of
- 'lTarget' samples. */
- ppe = energy;
- ppi = buf+LPC_FILTERORDER+lMem-lTarget-1;
- ppo = buf+LPC_FILTERORDER+lMem-1;
-
- *ppe=0.0;
- pp=buf+LPC_FILTERORDER+lMem-lTarget;
- for (j=0; j<lTarget; j++) {
- *ppe+=(*pp)*(*pp);
- ++pp;
- }
-
- if (*ppe>0.0) {
- invenergy[0] = (float) 1.0 / (*ppe + EPS);
- } else {
- invenergy[0] = (float) 0.0;
-
-
-
-
-
- }
- ppe++;
-
- measure=(float)-10000000.0;
-
- if (crossDot > 0.0) {
- measure = crossDot*crossDot*invenergy[0];
- }
- }
- else {
- measure = crossDot*crossDot*invenergy[0];
- }
-
- /* check if measure is better */
- ftmp = crossDot*invenergy[0];
-
- if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
- best_index = 0;
- max_measure = measure;
- gain = ftmp;
- }
-
- /* loop over the main first codebook section,
- full search */
-
- for (icount=1; icount<range; icount++) {
-
- /* calculate measure */
-
- crossDot=0.0;
- pp = buf+LPC_FILTERORDER+lMem-lTarget-icount;
-
- for (j=0; j<lTarget; j++) {
- crossDot += target[j]*(*pp++);
- }
-
- if (stage==0) {
- *ppe++ = energy[icount-1] + (*ppi)*(*ppi) -
- (*ppo)*(*ppo);
- ppo--;
- ppi--;
-
- if (energy[icount]>0.0) {
- invenergy[icount] =
- (float)1.0/(energy[icount]+EPS);
- } else {
- invenergy[icount] = (float) 0.0;
- }
-
-
-
-
-
- measure=(float)-10000000.0;
-
- if (crossDot > 0.0) {
- measure = crossDot*crossDot*invenergy[icount];
- }
- }
- else {
- measure = crossDot*crossDot*invenergy[icount];
- }
-
- /* check if measure is better */
- ftmp = crossDot*invenergy[icount];
-
- if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
- best_index = icount;
- max_measure = measure;
- gain = ftmp;
- }
- }
-
- /* Loop over augmented part in the first codebook
- * section, full search.
- * The vectors are interpolated.
- */
-
- if (lTarget==SUBL) {
-
- /* Search for best possible cb vector and
- compute the CB-vectors' energy. */
- searchAugmentedCB(20, 39, stage, base_size-lTarget/2,
- target, buf+LPC_FILTERORDER+lMem,
- &max_measure, &best_index, &gain, energy,
- invenergy);
- }
-
- /* set search range for following codebook sections */
-
- base_index=best_index;
-
- /* unrestricted search */
-
-# if CB_RESRANGE == -1
- //if (CB_RESRANGE == -1) {
- sInd=0;
- eInd=range-1;
- sIndAug=20;
- eIndAug=39;
- //}
-
-# else
-
- /* restricted search around best index from first
- codebook section */
-
- //else {
- /* Initialize search indices */
- sIndAug=0;
- eIndAug=0;
- sInd=base_index-CB_RESRANGE/2;
- eInd=sInd+CB_RESRANGE;
-
- if (lTarget==SUBL) {
-
- if (sInd<0) {
-
- sIndAug = 40 + sInd;
- eIndAug = 39;
- sInd=0;
-
- } else if ( base_index < (base_size-20) ) {
-
- if (eInd > range) {
- sInd -= (eInd-range);
- eInd = range;
- }
- } else { /* base_index >= (base_size-20) */
-
- if (sInd < (base_size-20)) {
- sIndAug = 20;
- sInd = 0;
- eInd = 0;
- eIndAug = 19 + CB_RESRANGE;
-
- if(eIndAug > 39) {
- eInd = eIndAug-39;
- eIndAug = 39;
- }
- } else {
- sIndAug = 20 + sInd - (base_size-20);
- eIndAug = 39;
- sInd = 0;
- eInd = CB_RESRANGE - (eIndAug-sIndAug+1);
- }
- }
-
- } else { /* lTarget = 22 or 23 */
-
- if (sInd < 0) {
- eInd -= sInd;
-
-
-
-
-
- sInd = 0;
- }
-
- if(eInd > range) {
- sInd -= (eInd - range);
- eInd = range;
- }
- }
-
- //}
-# endif /* CB_RESRANGE == -1 */
-
-
- /* search of higher codebook section */
-
- /* index search range */
- counter = sInd;
- sInd += base_size;
- eInd += base_size;
-
-
- if (stage==0) {
- ppe = energy+base_size;
- *ppe=0.0;
-
- pp=cbvectors+lMem-lTarget;
- for (j=0; j<lTarget; j++) {
- *ppe+=(*pp)*(*pp);
- ++pp;
- }
-
- ppi = cbvectors + lMem - 1 - lTarget;
- ppo = cbvectors + lMem - 1;
-
- for (j=0; j<(range-1); j++) {
- *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo);
- ppo--;
- ppi--;
- ppe++;
- }
- }
-
- /* loop over search range */
-
- for (icount=sInd; icount<eInd; icount++) {
-
- /* calculate measure */
-
- crossDot=0.0;
- pp=cbvectors + lMem - (counter++) - lTarget;
-
- for (j=0;j<lTarget;j++) {
-
-
-
-
-
- crossDot += target[j]*(*pp++);
- }
-
- if (energy[icount]>0.0) {
- invenergy[icount] =(float)1.0/(energy[icount]+EPS);
- } else {
- invenergy[icount] =(float)0.0;
- }
-
- if (stage==0) {
-
- measure=(float)-10000000.0;
-
- if (crossDot > 0.0) {
- measure = crossDot*crossDot*
- invenergy[icount];
- }
- }
- else {
- measure = crossDot*crossDot*invenergy[icount];
- }
-
- /* check if measure is better */
- ftmp = crossDot*invenergy[icount];
-
- if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
- best_index = icount;
- max_measure = measure;
- gain = ftmp;
- }
- }
-
- /* Search the augmented CB inside the limited range. */
-
- if ((lTarget==SUBL)&&(sIndAug!=0)) {
- searchAugmentedCB(sIndAug, eIndAug, stage,
- 2*base_size-20, target, cbvectors+lMem,
- &max_measure, &best_index, &gain, energy,
- invenergy);
- }
-
- /* record best index */
-
- index[stage] = best_index;
-
- /* gain quantization */
-
- if (stage==0){
-
-
-
-
-
-
- if (gain<0.0){
- gain = 0.0;
- }
-
- if (gain>CB_MAXGAIN) {
- gain = (float)CB_MAXGAIN;
- }
- gain = gainquant(gain, 1.0, 32, &gain_index[stage]);
- }
- else {
- if (stage==1) {
- gain = gainquant(gain, (float)fabs(gains[stage-1]),
- 16, &gain_index[stage]);
- } else {
- gain = gainquant(gain, (float)fabs(gains[stage-1]),
- 8, &gain_index[stage]);
- }
- }
-
- /* Extract the best (according to measure)
- codebook vector */
-
- if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) {
-
- if (index[stage]<base_size) {
- pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage];
- } else {
- pp=cbvectors+lMem-lTarget-
- index[stage]+base_size;
- }
- } else {
-
- if (index[stage]<base_size) {
- if (index[stage]<(base_size-20)) {
- pp=buf+LPC_FILTERORDER+lMem-
- lTarget-index[stage];
- } else {
- createAugmentedVec(index[stage]-base_size+40,
- buf+LPC_FILTERORDER+lMem,aug_vec);
- pp=aug_vec;
- }
- } else {
- int filterno, position;
-
- filterno=index[stage]/base_size;
- position=index[stage]-filterno*base_size;
-
-
-
-
-
-
-
- if (position<(base_size-20)) {
- pp=cbvectors+filterno*lMem-lTarget-
- index[stage]+filterno*base_size;
- } else {
- createAugmentedVec(
- index[stage]-(filterno+1)*base_size+40,
- cbvectors+filterno*lMem,aug_vec);
- pp=aug_vec;
- }
- }
- }
-
- /* Subtract the best codebook vector, according
- to measure, from the target vector */
-
- for (j=0;j<lTarget;j++) {
- cvec[j] += gain*(*pp);
- target[j] -= gain*(*pp++);
- }
-
- /* record quantized gain */
-
- gains[stage]=gain;
-
- }/* end of Main Loop. for (stage=0;... */
-
- /* Gain adjustment for energy matching */
- cene=0.0;
- for (i=0; i<lTarget; i++) {
- cene+=cvec[i]*cvec[i];
- }
- j=gain_index[0];
-
- for (i=gain_index[0]; i<32; i++) {
- ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i];
-
- if ((ftmp<(tene*gains[0]*gains[0])) &&
- (gain_sq5Tbl[j]<(2.0*gains[0]))) {
- j=i;
- }
- }
- gain_index[0]=j;
- }
-
-
-
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.h b/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.h
deleted file mode 100644
index a61db15403215beedc47ef0957d0b3f110432d19..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iCBSearch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iCBSearch.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_ICBSEARCH_H
- #define __iLBC_ICBSEARCH_H
-
-
-
-
-
-
- void iCBSearch(
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i) the encoder state structure */
- int *index, /* (o) Codebook indices */
- int *gain_index,/* (o) Gain quantization indices */
- float *intarget,/* (i) Target vector for encoding */
- float *mem, /* (i) Buffer for codebook construction */
- int lMem, /* (i) Length of buffer */
- int lTarget, /* (i) Length of vector */
- int nStages, /* (i) Number of codebook stages */
- float *weightDenum, /* (i) weighting filter coefficients */
- float *weightState, /* (i) weighting filter state */
- int block /* (i) the sub-block number */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.c b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.c
deleted file mode 100644
index 33d3f740f45774227c2523760ddb2a28cdc1232d..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.c
+++ /dev/null
@@ -1,652 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iLBC_decode.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <stdlib.h>
-
- #include "iLBC_define.h"
- #include "StateConstructW.h"
- #include "LPCdecode.h"
- #include "iCBConstruct.h"
- #include "doCPLC.h"
- #include "helpfun.h"
- #include "constants.h"
- #include "packing.h"
- #include "string.h"
- #include "enhancer.h"
- #include "hpOutput.h"
- #include "syntFilter.h"
-
- /*----------------------------------------------------------------*
- * Initiation of decoder instance.
- *---------------------------------------------------------------*/
-
- short initDecode( /* (o) Number of decoded
- samples */
- iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */
- int mode, /* (i) frame size mode */
- int use_enhancer /* (i) 1 to use enhancer
- 0 to run without
- enhancer */
- ){
- int i;
-
- iLBCdec_inst->mode = mode;
-
-
-
-
-
- if (mode==30) {
- iLBCdec_inst->blockl = BLOCKL_30MS;
- iLBCdec_inst->nsub = NSUB_30MS;
- iLBCdec_inst->nasub = NASUB_30MS;
- iLBCdec_inst->lpc_n = LPC_N_30MS;
- iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS;
- iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS;
- iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS;
- /* ULP init */
- iLBCdec_inst->ULP_inst=&ULP_30msTbl;
- }
- else if (mode==20) {
- iLBCdec_inst->blockl = BLOCKL_20MS;
- iLBCdec_inst->nsub = NSUB_20MS;
- iLBCdec_inst->nasub = NASUB_20MS;
- iLBCdec_inst->lpc_n = LPC_N_20MS;
- iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS;
- iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS;
- iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS;
- /* ULP init */
- iLBCdec_inst->ULP_inst=&ULP_20msTbl;
- }
- else {
- exit(2);
- }
-
- memset(iLBCdec_inst->syntMem, 0,
- LPC_FILTERORDER*sizeof(float));
- memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl,
- LPC_FILTERORDER*sizeof(float));
-
- memset(iLBCdec_inst->old_syntdenum, 0,
- ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float));
- for (i=0; i<NSUB_MAX; i++)
- iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0;
-
- iLBCdec_inst->last_lag = 20;
-
- iLBCdec_inst->prevLag = 120;
- iLBCdec_inst->per = 0.0;
- iLBCdec_inst->consPLICount = 0;
- iLBCdec_inst->prevPLI = 0;
- iLBCdec_inst->prevLpc[0] = 1.0;
- memset(iLBCdec_inst->prevLpc+1,0,
- LPC_FILTERORDER*sizeof(float));
- memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float));
- iLBCdec_inst->seed=777;
-
-
-
-
-
-
- memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
-
- iLBCdec_inst->use_enhancer = use_enhancer;
- memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
- for (i=0;i<ENH_NBLOCKS_TOT;i++)
- iLBCdec_inst->enh_period[i]=(float)40.0;
-
- iLBCdec_inst->prev_enh_pl = 0;
-
- return (short)(iLBCdec_inst->blockl);
- }
-
- /*----------------------------------------------------------------*
- * frame residual decoder function (subrutine to iLBC_decode)
- *---------------------------------------------------------------*/
-
- void Decode(
- iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state
- structure */
- float *decresidual, /* (o) decoded residual frame */
- int start, /* (i) location of start
- state */
- int idxForMax, /* (i) codebook index for the
- maximum value */
- int *idxVec, /* (i) codebook indexes for the
- samples in the start
- state */
- float *syntdenum, /* (i) the decoded synthesis
- filter coefficients */
- int *cb_index, /* (i) the indexes for the
- adaptive codebook */
- int *gain_index, /* (i) the indexes for the
- corresponding gains */
- int *extra_cb_index, /* (i) the indexes for the
- adaptive codebook part
- of start state */
- int *extra_gain_index, /* (i) the indexes for the
- corresponding gains */
- int state_first /* (i) 1 if non adaptive part
- of start state comes
- first 0 if that part
- comes last */
- ){
- float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
- int k, meml_gotten, Nfor, Nback, i;
- int diff, start_pos;
- int subcount, subframe;
-
-
-
-
-
-
- diff = STATE_LEN - iLBCdec_inst->state_short_len;
-
- if (state_first == 1) {
- start_pos = (start-1)*SUBL;
- } else {
- start_pos = (start-1)*SUBL + diff;
- }
-
- /* decode scalar part of start state */
-
- StateConstructW(idxForMax, idxVec,
- &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
- &decresidual[start_pos], iLBCdec_inst->state_short_len);
-
-
- if (state_first) { /* put adaptive part in the end */
-
- /* setup memory */
-
- memset(mem, 0,
- (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float));
- memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len,
- decresidual+start_pos,
- iLBCdec_inst->state_short_len*sizeof(float));
-
- /* construct decoded vector */
-
- iCBConstruct(
- &decresidual[start_pos+iLBCdec_inst->state_short_len],
- extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl,
- stMemLTbl, diff, CB_NSTAGES);
-
- }
- else {/* put adaptive part in the beginning */
-
- /* create reversed vectors for prediction */
-
- for (k=0; k<diff; k++) {
- reverseDecresidual[k] =
- decresidual[(start+1)*SUBL-1-
- (k+iLBCdec_inst->state_short_len)];
- }
-
- /* setup memory */
-
- meml_gotten = iLBCdec_inst->state_short_len;
- for (k=0; k<meml_gotten; k++){
- mem[CB_MEML-1-k] = decresidual[start_pos + k];
-
-
-
-
-
- }
- memset(mem, 0, (CB_MEML-k)*sizeof(float));
-
- /* construct decoded vector */
-
- iCBConstruct(reverseDecresidual, extra_cb_index,
- extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
- diff, CB_NSTAGES);
-
- /* get decoded residual from reversed vector */
-
- for (k=0; k<diff; k++) {
- decresidual[start_pos-1-k] = reverseDecresidual[k];
- }
- }
-
- /* counter for predicted sub-frames */
-
- subcount=0;
-
- /* forward prediction of sub-frames */
-
- Nfor = iLBCdec_inst->nsub-start-1;
-
- if ( Nfor > 0 ){
-
- /* setup memory */
-
- memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
- memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
- STATE_LEN*sizeof(float));
-
- /* loop over sub-frames to encode */
-
- for (subframe=0; subframe<Nfor; subframe++) {
-
- /* construct decoded vector */
-
- iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
- cb_index+subcount*CB_NSTAGES,
- gain_index+subcount*CB_NSTAGES,
- mem+CB_MEML-memLfTbl[subcount],
- memLfTbl[subcount], SUBL, CB_NSTAGES);
-
- /* update memory */
-
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
- memcpy(mem+CB_MEML-SUBL,
-
-
-
-
-
- &decresidual[(start+1+subframe)*SUBL],
- SUBL*sizeof(float));
-
- subcount++;
-
- }
-
- }
-
- /* backward prediction of sub-frames */
-
- Nback = start-1;
-
- if ( Nback > 0 ) {
-
- /* setup memory */
-
- meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start);
-
- if ( meml_gotten > CB_MEML ) {
- meml_gotten=CB_MEML;
- }
- for (k=0; k<meml_gotten; k++) {
- mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
- }
- memset(mem, 0, (CB_MEML-k)*sizeof(float));
-
- /* loop over subframes to decode */
-
- for (subframe=0; subframe<Nback; subframe++) {
-
- /* construct decoded vector */
-
- iCBConstruct(&reverseDecresidual[subframe*SUBL],
- cb_index+subcount*CB_NSTAGES,
- gain_index+subcount*CB_NSTAGES,
- mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount],
- SUBL, CB_NSTAGES);
-
- /* update memory */
-
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
- memcpy(mem+CB_MEML-SUBL,
- &reverseDecresidual[subframe*SUBL],
- SUBL*sizeof(float));
-
- subcount++;
- }
-
-
-
-
-
- /* get decoded residual from reversed vector */
-
- for (i=0; i<SUBL*Nback; i++)
- decresidual[SUBL*Nback - i - 1] =
- reverseDecresidual[i];
- }
- }
-
- /*----------------------------------------------------------------*
- * main decoder function
- *---------------------------------------------------------------*/
-
- void iLBC_decode(
- float *decblock, /* (o) decoded signal block */
- unsigned char *bytes, /* (i) encoded signal bits */
- iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state
- structure */
- int mode /* (i) 0: bad packet, PLC,
- 1: normal */
- ){
- float data[BLOCKL_MAX];
- float lsfdeq[LPC_FILTERORDER*LPC_N_MAX];
- float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1];
- float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1];
- int k, i, start, idxForMax, pos, lastpart, ulp;
- int lag, ilag;
- float cc, maxcc;
- int idxVec[STATE_LEN];
- int check;
- int gain_index[NASUB_MAX*CB_NSTAGES],
- extra_gain_index[CB_NSTAGES];
- int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES];
- int lsf_i[LSF_NSPLIT*LPC_N_MAX];
- int state_first;
- int last_bit;
- unsigned char *pbytes;
- float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
- int order_plus_one;
- float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
- float decresidual[BLOCKL_MAX];
-
- if (mode>0) { /* the data are good */
-
- /* decode data */
-
- pbytes=bytes;
- pos=0;
-
-
-
-
-
-
- /* Set everything to zero before decoding */
-
- for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) {
- lsf_i[k]=0;
- }
- start=0;
- state_first=0;
- idxForMax=0;
- for (k=0; k<iLBCdec_inst->state_short_len; k++) {
- idxVec[k]=0;
- }
- for (k=0; k<CB_NSTAGES; k++) {
- extra_cb_index[k]=0;
- }
- for (k=0; k<CB_NSTAGES; k++) {
- extra_gain_index[k]=0;
- }
- for (i=0; i<iLBCdec_inst->nasub; i++) {
- for (k=0; k<CB_NSTAGES; k++) {
- cb_index[i*CB_NSTAGES+k]=0;
- }
- }
- for (i=0; i<iLBCdec_inst->nasub; i++) {
- for (k=0; k<CB_NSTAGES; k++) {
- gain_index[i*CB_NSTAGES+k]=0;
- }
- }
-
- /* loop over ULP classes */
-
- for (ulp=0; ulp<3; ulp++) {
-
- /* LSF */
- for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){
- unpack( &pbytes, &lastpart,
- iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos);
- packcombine(&lsf_i[k], lastpart,
- iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]);
- }
-
- /* Start block info */
-
- unpack( &pbytes, &lastpart,
- iLBCdec_inst->ULP_inst->start_bits[ulp], &pos);
- packcombine(&start, lastpart,
- iLBCdec_inst->ULP_inst->start_bits[ulp]);
-
- unpack( &pbytes, &lastpart,
-
-
-
-
-
- iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos);
- packcombine(&state_first, lastpart,
- iLBCdec_inst->ULP_inst->startfirst_bits[ulp]);
-
- unpack( &pbytes, &lastpart,
- iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos);
- packcombine(&idxForMax, lastpart,
- iLBCdec_inst->ULP_inst->scale_bits[ulp]);
-
- for (k=0; k<iLBCdec_inst->state_short_len; k++) {
- unpack( &pbytes, &lastpart,
- iLBCdec_inst->ULP_inst->state_bits[ulp], &pos);
- packcombine(idxVec+k, lastpart,
- iLBCdec_inst->ULP_inst->state_bits[ulp]);
- }
-
- /* 23/22 (20ms/30ms) sample block */
-
- for (k=0; k<CB_NSTAGES; k++) {
- unpack( &pbytes, &lastpart,
- iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp],
- &pos);
- packcombine(extra_cb_index+k, lastpart,
- iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]);
- }
- for (k=0; k<CB_NSTAGES; k++) {
- unpack( &pbytes, &lastpart,
- iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp],
- &pos);
- packcombine(extra_gain_index+k, lastpart,
- iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]);
- }
-
- /* The two/four (20ms/30ms) 40 sample sub-blocks */
-
- for (i=0; i<iLBCdec_inst->nasub; i++) {
- for (k=0; k<CB_NSTAGES; k++) {
- unpack( &pbytes, &lastpart,
- iLBCdec_inst->ULP_inst->cb_index[i][k][ulp],
- &pos);
- packcombine(cb_index+i*CB_NSTAGES+k, lastpart,
- iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]);
- }
- }
-
- for (i=0; i<iLBCdec_inst->nasub; i++) {
- for (k=0; k<CB_NSTAGES; k++) {
- unpack( &pbytes, &lastpart,
-
-
-
-
-
- iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp],
- &pos);
- packcombine(gain_index+i*CB_NSTAGES+k, lastpart,
- iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]);
- }
- }
- }
- /* Extract last bit. If it is 1 this indicates an
- empty/lost frame */
- unpack( &pbytes, &last_bit, 1, &pos);
-
- /* Check for bit errors or empty/lost frames */
- if (start<1)
- mode = 0;
- if (iLBCdec_inst->mode==20 && start>3)
- mode = 0;
- if (iLBCdec_inst->mode==30 && start>5)
- mode = 0;
- if (last_bit==1)
- mode = 0;
-
- if (mode==1) { /* No bit errors was detected,
- continue decoding */
-
- /* adjust index */
- index_conv_dec(cb_index);
-
- /* decode the lsf */
-
- SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
- check=LSF_check(lsfdeq, LPC_FILTERORDER,
- iLBCdec_inst->lpc_n);
- DecoderInterpolateLSF(syntdenum, weightdenum,
- lsfdeq, LPC_FILTERORDER, iLBCdec_inst);
-
- Decode(iLBCdec_inst, decresidual, start, idxForMax,
- idxVec, syntdenum, cb_index, gain_index,
- extra_cb_index, extra_gain_index,
- state_first);
-
- /* preparing the plc for a future loss! */
-
- doThePLC(PLCresidual, PLClpc, 0, decresidual,
- syntdenum +
- (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1),
- (*iLBCdec_inst).last_lag, iLBCdec_inst);
-
-
-
-
-
-
-
- memcpy(decresidual, PLCresidual,
- iLBCdec_inst->blockl*sizeof(float));
- }
-
- }
-
- if (mode == 0) {
- /* the data is bad (either a PLC call
- * was made or a severe bit error was detected)
- */
-
- /* packet loss conceal */
-
- memset(zeros, 0, BLOCKL_MAX*sizeof(float));
-
- one[0] = 1;
- memset(one+1, 0, LPC_FILTERORDER*sizeof(float));
-
- start=0;
-
- doThePLC(PLCresidual, PLClpc, 1, zeros, one,
- (*iLBCdec_inst).last_lag, iLBCdec_inst);
- memcpy(decresidual, PLCresidual,
- iLBCdec_inst->blockl*sizeof(float));
-
- order_plus_one = LPC_FILTERORDER + 1;
- for (i = 0; i < iLBCdec_inst->nsub; i++) {
- memcpy(syntdenum+(i*order_plus_one), PLClpc,
- order_plus_one*sizeof(float));
- }
- }
-
- if (iLBCdec_inst->use_enhancer == 1) {
-
- /* post filtering */
-
- iLBCdec_inst->last_lag =
- enhancerInterface(data, decresidual, iLBCdec_inst);
-
- /* synthesis filtering */
-
- if (iLBCdec_inst->mode==20) {
- /* Enhancer has 40 samples delay */
- i=0;
- syntFilter(data + i*SUBL,
- iLBCdec_inst->old_syntdenum +
- (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1),
- SUBL, iLBCdec_inst->syntMem);
-
-
-
-
-
- for (i=1; i < iLBCdec_inst->nsub; i++) {
- syntFilter(data + i*SUBL,
- syntdenum + (i-1)*(LPC_FILTERORDER+1),
- SUBL, iLBCdec_inst->syntMem);
- }
- } else if (iLBCdec_inst->mode==30) {
- /* Enhancer has 80 samples delay */
- for (i=0; i < 2; i++) {
- syntFilter(data + i*SUBL,
- iLBCdec_inst->old_syntdenum +
- (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1),
- SUBL, iLBCdec_inst->syntMem);
- }
- for (i=2; i < iLBCdec_inst->nsub; i++) {
- syntFilter(data + i*SUBL,
- syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL,
- iLBCdec_inst->syntMem);
- }
- }
-
- } else {
-
- /* Find last lag */
- lag = 20;
- maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
- &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL);
-
- for (ilag=21; ilag<120; ilag++) {
- cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL],
- &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag],
- ENH_BLOCKL);
-
- if (cc > maxcc) {
- maxcc = cc;
- lag = ilag;
- }
- }
- iLBCdec_inst->last_lag = lag;
-
- /* copy data and run synthesis filter */
-
- memcpy(data, decresidual,
- iLBCdec_inst->blockl*sizeof(float));
- for (i=0; i < iLBCdec_inst->nsub; i++) {
- syntFilter(data + i*SUBL,
- syntdenum + i*(LPC_FILTERORDER+1), SUBL,
- iLBCdec_inst->syntMem);
- }
-
-
-
-
-
- }
-
- /* high pass filtering on output if desired, otherwise
- copy to out */
-
- hpOutput(data, iLBCdec_inst->blockl,
- decblock,iLBCdec_inst->hpomem);
-
- /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/
-
- memcpy(iLBCdec_inst->old_syntdenum, syntdenum,
-
- iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float));
-
- iLBCdec_inst->prev_enh_pl=0;
-
- if (mode==0) { /* PLC was used */
- iLBCdec_inst->prev_enh_pl=1;
- }
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.h b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.h
deleted file mode 100644
index 5f4384dcde8fc9400ccab82ae7df7cd010a0191a..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_decode.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iLBC_decode.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_ILBCDECODE_H
- #define __iLBC_ILBCDECODE_H
-
- #include "iLBC_define.h"
-
- short initDecode( /* (o) Number of decoded
- samples */
- iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */
- int mode, /* (i) frame size mode */
- int use_enhancer /* (i) 1 to use enhancer
- 0 to run without
- enhancer */
- );
-
- void iLBC_decode(
- float *decblock, /* (o) decoded signal block */
- unsigned char *bytes, /* (i) encoded signal bits */
- iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) the decoder state
- structure */
- int mode /* (i) 0: bad packet, PLC,
- 1: normal */
-
-
-
-
-
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_define.h b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_define.h
deleted file mode 100644
index 480c834b97c36d9fe0685bf57e337b532d7700a3..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_define.h
+++ /dev/null
@@ -1,217 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iLBC_define.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
- #include <string.h>
-
- #ifndef __iLBC_ILBCDEFINE_H
- #define __iLBC_ILBCDEFINE_H
-
- /* general codec settings */
-
- #define FS (float)8000.0
- #define BLOCKL_20MS 160
- #define BLOCKL_30MS 240
- #define BLOCKL_MAX 240
- #define NSUB_20MS 4
- #define NSUB_30MS 6
- #define NSUB_MAX 6
- #define NASUB_20MS 2
-
-
-
-
-
- #define NASUB_30MS 4
- #define NASUB_MAX 4
- #define SUBL 40
- #define STATE_LEN 80
- #define STATE_SHORT_LEN_30MS 58
- #define STATE_SHORT_LEN_20MS 57
-
- /* LPC settings */
-
- #define LPC_FILTERORDER 10
- #define LPC_CHIRP_SYNTDENUM (float)0.9025
- #define LPC_CHIRP_WEIGHTDENUM (float)0.4222
- #define LPC_LOOKBACK 60
- #define LPC_N_20MS 1
- #define LPC_N_30MS 2
- #define LPC_N_MAX 2
- #define LPC_ASYMDIFF 20
- #define LPC_BW (float)60.0
- #define LPC_WN (float)1.0001
- #define LSF_NSPLIT 3
- #define LSF_NUMBER_OF_STEPS 4
- #define LPC_HALFORDER (LPC_FILTERORDER/2)
-
- /* cb settings */
-
- #define CB_NSTAGES 3
- #define CB_EXPAND 2
- #define CB_MEML 147
- #define CB_FILTERLEN 2*4
- #define CB_HALFFILTERLEN 4
- #define CB_RESRANGE 34
- #define CB_MAXGAIN (float)1.3
-
- /* enhancer */
-
- #define ENH_BLOCKL 80 /* block length */
- #define ENH_BLOCKL_HALF (ENH_BLOCKL/2)
- #define ENH_HL 3 /* 2*ENH_HL+1 is number blocks
- in said second sequence */
- #define ENH_SLOP 2 /* max difference estimated and
- correct pitch period */
- #define ENH_PLOCSL 20 /* pitch-estimates and pitch-
- locations buffer length */
- #define ENH_OVERHANG 2
- #define ENH_UPS0 4 /* upsampling rate */
- #define ENH_FL0 3 /* 2*FLO+1 is the length of
- each filter */
- #define ENH_VECTL (ENH_BLOCKL+2*ENH_FL0)
-
-
-
-
-
- #define ENH_CORRDIM (2*ENH_SLOP+1)
- #define ENH_NBLOCKS (BLOCKL_MAX/ENH_BLOCKL)
- #define ENH_NBLOCKS_EXTRA 5
- #define ENH_NBLOCKS_TOT 8 /* ENH_NBLOCKS +
- ENH_NBLOCKS_EXTRA */
- #define ENH_BUFL (ENH_NBLOCKS_TOT)*ENH_BLOCKL
- #define ENH_ALPHA0 (float)0.05
-
- /* Down sampling */
-
- #define FILTERORDER_DS 7
- #define DELAY_DS 3
- #define FACTOR_DS 2
-
- /* bit stream defs */
-
- #define NO_OF_BYTES_20MS 38
- #define NO_OF_BYTES_30MS 50
- #define NO_OF_WORDS_20MS 19
- #define NO_OF_WORDS_30MS 25
- #define STATE_BITS 3
- #define BYTE_LEN 8
- #define ULP_CLASSES 3
-
- /* help parameters */
-
- #define FLOAT_MAX (float)1.0e37
- #define EPS (float)2.220446049250313e-016
- #define PI (float)3.14159265358979323846
- #define MIN_SAMPLE -32768
- #define MAX_SAMPLE 32767
- #define TWO_PI (float)6.283185307
- #define PI2 (float)0.159154943
-
- /* type definition encoder instance */
- typedef struct iLBC_ULP_Inst_t_ {
- int lsf_bits[6][ULP_CLASSES+2];
- int start_bits[ULP_CLASSES+2];
- int startfirst_bits[ULP_CLASSES+2];
- int scale_bits[ULP_CLASSES+2];
- int state_bits[ULP_CLASSES+2];
- int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2];
- int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2];
- int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
- int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
- } iLBC_ULP_Inst_t;
-
- /* type definition encoder instance */
-
-
-
-
-
- typedef struct iLBC_Enc_Inst_t_ {
-
- /* flag for frame size mode */
- int mode;
-
- /* basic parameters for different frame sizes */
- int blockl;
- int nsub;
- int nasub;
- int no_of_bytes, no_of_words;
- int lpc_n;
- int state_short_len;
- const iLBC_ULP_Inst_t *ULP_inst;
-
- /* analysis filter state */
- float anaMem[LPC_FILTERORDER];
-
- /* old lsf parameters for interpolation */
- float lsfold[LPC_FILTERORDER];
- float lsfdeqold[LPC_FILTERORDER];
-
- /* signal buffer for LP analysis */
- float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX];
-
- /* state of input HP filter */
- float hpimem[4];
-
- } iLBC_Enc_Inst_t;
-
- /* type definition decoder instance */
- typedef struct iLBC_Dec_Inst_t_ {
-
- /* flag for frame size mode */
- int mode;
-
- /* basic parameters for different frame sizes */
- int blockl;
- int nsub;
- int nasub;
- int no_of_bytes, no_of_words;
- int lpc_n;
- int state_short_len;
- const iLBC_ULP_Inst_t *ULP_inst;
-
- /* synthesis filter state */
- float syntMem[LPC_FILTERORDER];
-
- /* old LSF for interpolation */
-
-
-
-
-
- float lsfdeqold[LPC_FILTERORDER];
-
- /* pitch lag estimated in enhancer and used in PLC */
- int last_lag;
-
- /* PLC state information */
- int prevLag, consPLICount, prevPLI, prev_enh_pl;
- float prevLpc[LPC_FILTERORDER+1];
- float prevResidual[NSUB_MAX*SUBL];
- float per;
- unsigned long seed;
-
- /* previous synthesis filter parameters */
- float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
-
- /* state of output HP filter */
- float hpomem[4];
-
- /* enhancer state information */
- int use_enhancer;
- float enh_buf[ENH_BUFL];
- float enh_period[ENH_NBLOCKS_TOT];
-
- } iLBC_Dec_Inst_t;
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.c b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.c
deleted file mode 100644
index 438545883df2e0540e5558686005f502c518a4d9..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.c
+++ /dev/null
@@ -1,543 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iLBC_encode.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <stdlib.h>
- #include <string.h>
-
- #include "iLBC_define.h"
- #include "LPCencode.h"
- #include "FrameClassify.h"
- #include "StateSearchW.h"
- #include "StateConstructW.h"
- #include "helpfun.h"
- #include "constants.h"
- #include "packing.h"
- #include "iCBSearch.h"
- #include "iCBConstruct.h"
- #include "hpInput.h"
- #include "anaFilter.h"
- #include "syntFilter.h"
-
- /*----------------------------------------------------------------*
- * Initiation of encoder instance.
- *---------------------------------------------------------------*/
-
- short initEncode( /* (o) Number of bytes
- encoded */
- iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */
- int mode /* (i) frame size mode */
- ){
- iLBCenc_inst->mode = mode;
- if (mode==30) {
- iLBCenc_inst->blockl = BLOCKL_30MS;
- iLBCenc_inst->nsub = NSUB_30MS;
- iLBCenc_inst->nasub = NASUB_30MS;
- iLBCenc_inst->lpc_n = LPC_N_30MS;
- iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS;
- iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS;
-
-
-
-
-
- iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS;
- /* ULP init */
- iLBCenc_inst->ULP_inst=&ULP_30msTbl;
- }
- else if (mode==20) {
- iLBCenc_inst->blockl = BLOCKL_20MS;
- iLBCenc_inst->nsub = NSUB_20MS;
- iLBCenc_inst->nasub = NASUB_20MS;
- iLBCenc_inst->lpc_n = LPC_N_20MS;
- iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS;
- iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS;
- iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS;
- /* ULP init */
- iLBCenc_inst->ULP_inst=&ULP_20msTbl;
- }
- else {
- exit(2);
- }
-
- memset((*iLBCenc_inst).anaMem, 0,
- LPC_FILTERORDER*sizeof(float));
- memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl,
- LPC_FILTERORDER*sizeof(float));
- memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl,
- LPC_FILTERORDER*sizeof(float));
- memset((*iLBCenc_inst).lpc_buffer, 0,
- (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float));
- memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
-
- return (short)(iLBCenc_inst->no_of_bytes);
- }
-
- /*----------------------------------------------------------------*
- * main encoder function
- *---------------------------------------------------------------*/
-
- void iLBC_encode(
- unsigned char *bytes, /* (o) encoded data bits iLBC */
- float *block, /* (o) speech vector to
- encode */
- iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder
- state */
- ){
-
- float data[BLOCKL_MAX];
- float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX];
-
- int start, idxForMax, idxVec[STATE_LEN];
-
-
-
-
-
- float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
- int n, k, meml_gotten, Nfor, Nback, i, pos;
- int gain_index[CB_NSTAGES*NASUB_MAX],
- extra_gain_index[CB_NSTAGES];
- int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES];
- int lsf_i[LSF_NSPLIT*LPC_N_MAX];
- unsigned char *pbytes;
- int diff, start_pos, state_first;
- float en1, en2;
- int index, ulp, firstpart;
- int subcount, subframe;
- float weightState[LPC_FILTERORDER];
- float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
- float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)];
- float decresidual[BLOCKL_MAX];
-
- /* high pass filtering of input signal if such is not done
- prior to calling this function */
-
- hpInput(block, iLBCenc_inst->blockl,
- data, (*iLBCenc_inst).hpimem);
-
- /* otherwise simply copy */
-
- /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/
-
- /* LPC of hp filtered input data */
-
- LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst);
-
-
- /* inverse filter to get residual */
-
- for (n=0; n<iLBCenc_inst->nsub; n++) {
- anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)],
- SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem);
- }
-
- /* find state location */
-
- start = FrameClassify(iLBCenc_inst, residual);
-
- /* check if state should be in first or last part of the
- two subframes */
-
- diff = STATE_LEN - iLBCenc_inst->state_short_len;
- en1 = 0;
- index = (start-1)*SUBL;
-
-
-
-
-
- for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
- en1 += residual[index+i]*residual[index+i];
- }
- en2 = 0;
- index = (start-1)*SUBL+diff;
- for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
- en2 += residual[index+i]*residual[index+i];
- }
-
-
- if (en1 > en2) {
- state_first = 1;
- start_pos = (start-1)*SUBL;
- } else {
- state_first = 0;
- start_pos = (start-1)*SUBL + diff;
- }
-
- /* scalar quantization of state */
-
- StateSearchW(iLBCenc_inst, &residual[start_pos],
- &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
- &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax,
- idxVec, iLBCenc_inst->state_short_len, state_first);
-
- StateConstructW(idxForMax, idxVec,
- &syntdenum[(start-1)*(LPC_FILTERORDER+1)],
- &decresidual[start_pos], iLBCenc_inst->state_short_len);
-
- /* predictive quantization in state */
-
- if (state_first) { /* put adaptive part in the end */
-
- /* setup memory */
-
- memset(mem, 0,
- (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float));
- memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len,
- decresidual+start_pos,
- iLBCenc_inst->state_short_len*sizeof(float));
- memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
- /* encode sub-frames */
-
- iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
- &residual[start_pos+iLBCenc_inst->state_short_len],
- mem+CB_MEML-stMemLTbl,
- stMemLTbl, diff, CB_NSTAGES,
-
-
-
-
-
- &weightdenum[start*(LPC_FILTERORDER+1)],
- weightState, 0);
-
- /* construct decoded vector */
-
- iCBConstruct(
- &decresidual[start_pos+iLBCenc_inst->state_short_len],
- extra_cb_index, extra_gain_index,
- mem+CB_MEML-stMemLTbl,
- stMemLTbl, diff, CB_NSTAGES);
-
- }
- else { /* put adaptive part in the beginning */
-
- /* create reversed vectors for prediction */
-
- for (k=0; k<diff; k++) {
- reverseResidual[k] = residual[(start+1)*SUBL-1
- -(k+iLBCenc_inst->state_short_len)];
- }
-
- /* setup memory */
-
- meml_gotten = iLBCenc_inst->state_short_len;
- for (k=0; k<meml_gotten; k++) {
- mem[CB_MEML-1-k] = decresidual[start_pos + k];
- }
- memset(mem, 0, (CB_MEML-k)*sizeof(float));
- memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
- /* encode sub-frames */
-
- iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index,
- reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl,
- diff, CB_NSTAGES,
- &weightdenum[(start-1)*(LPC_FILTERORDER+1)],
- weightState, 0);
-
- /* construct decoded vector */
-
- iCBConstruct(reverseDecresidual, extra_cb_index,
- extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
- diff, CB_NSTAGES);
-
- /* get decoded residual from reversed vector */
-
- for (k=0; k<diff; k++) {
- decresidual[start_pos-1-k] = reverseDecresidual[k];
-
-
-
-
-
- }
- }
-
- /* counter for predicted sub-frames */
-
- subcount=0;
-
- /* forward prediction of sub-frames */
-
- Nfor = iLBCenc_inst->nsub-start-1;
-
-
- if ( Nfor > 0 ) {
-
- /* setup memory */
-
- memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
- memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
- STATE_LEN*sizeof(float));
- memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
- /* loop over sub-frames to encode */
-
- for (subframe=0; subframe<Nfor; subframe++) {
-
- /* encode sub-frame */
-
- iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
- gain_index+subcount*CB_NSTAGES,
- &residual[(start+1+subframe)*SUBL],
- mem+CB_MEML-memLfTbl[subcount],
- memLfTbl[subcount], SUBL, CB_NSTAGES,
- &weightdenum[(start+1+subframe)*
- (LPC_FILTERORDER+1)],
- weightState, subcount+1);
-
- /* construct decoded vector */
-
- iCBConstruct(&decresidual[(start+1+subframe)*SUBL],
- cb_index+subcount*CB_NSTAGES,
- gain_index+subcount*CB_NSTAGES,
- mem+CB_MEML-memLfTbl[subcount],
- memLfTbl[subcount], SUBL, CB_NSTAGES);
-
- /* update memory */
-
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
- memcpy(mem+CB_MEML-SUBL,
-
-
-
-
-
- &decresidual[(start+1+subframe)*SUBL],
- SUBL*sizeof(float));
- memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
- subcount++;
- }
- }
-
-
- /* backward prediction of sub-frames */
-
- Nback = start-1;
-
-
- if ( Nback > 0 ) {
-
- /* create reverse order vectors */
-
- for (n=0; n<Nback; n++) {
- for (k=0; k<SUBL; k++) {
- reverseResidual[n*SUBL+k] =
- residual[(start-1)*SUBL-1-n*SUBL-k];
- reverseDecresidual[n*SUBL+k] =
- decresidual[(start-1)*SUBL-1-n*SUBL-k];
- }
- }
-
- /* setup memory */
-
- meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start);
-
-
- if ( meml_gotten > CB_MEML ) {
- meml_gotten=CB_MEML;
- }
- for (k=0; k<meml_gotten; k++) {
- mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
- }
- memset(mem, 0, (CB_MEML-k)*sizeof(float));
- memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
- /* loop over sub-frames to encode */
-
- for (subframe=0; subframe<Nback; subframe++) {
-
- /* encode sub-frame */
-
- iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES,
-
-
-
-
-
- gain_index+subcount*CB_NSTAGES,
- &reverseResidual[subframe*SUBL],
- mem+CB_MEML-memLfTbl[subcount],
- memLfTbl[subcount], SUBL, CB_NSTAGES,
- &weightdenum[(start-2-subframe)*
- (LPC_FILTERORDER+1)],
- weightState, subcount+1);
-
- /* construct decoded vector */
-
- iCBConstruct(&reverseDecresidual[subframe*SUBL],
- cb_index+subcount*CB_NSTAGES,
- gain_index+subcount*CB_NSTAGES,
- mem+CB_MEML-memLfTbl[subcount],
- memLfTbl[subcount], SUBL, CB_NSTAGES);
-
- /* update memory */
-
- memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
- memcpy(mem+CB_MEML-SUBL,
- &reverseDecresidual[subframe*SUBL],
- SUBL*sizeof(float));
- memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-
- subcount++;
-
- }
-
- /* get decoded residual from reversed vector */
-
- for (i=0; i<SUBL*Nback; i++) {
- decresidual[SUBL*Nback - i - 1] =
- reverseDecresidual[i];
- }
- }
- /* end encoding part */
-
- /* adjust index */
- index_conv_enc(cb_index);
-
- /* pack bytes */
-
- pbytes=bytes;
- pos=0;
-
- /* loop over the 3 ULP classes */
-
- for (ulp=0; ulp<3; ulp++) {
-
-
-
-
-
-
- /* LSF */
- for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) {
- packsplit(&lsf_i[k], &firstpart, &lsf_i[k],
- iLBCenc_inst->ULP_inst->lsf_bits[k][ulp],
- iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+
- iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+
- iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos);
- }
-
- /* Start block info */
-
- packsplit(&start, &firstpart, &start,
- iLBCenc_inst->ULP_inst->start_bits[ulp],
- iLBCenc_inst->ULP_inst->start_bits[ulp]+
- iLBCenc_inst->ULP_inst->start_bits[ulp+1]+
- iLBCenc_inst->ULP_inst->start_bits[ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->start_bits[ulp], &pos);
-
- packsplit(&state_first, &firstpart, &state_first,
- iLBCenc_inst->ULP_inst->startfirst_bits[ulp],
- iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+
- iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+
- iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos);
-
- packsplit(&idxForMax, &firstpart, &idxForMax,
- iLBCenc_inst->ULP_inst->scale_bits[ulp],
- iLBCenc_inst->ULP_inst->scale_bits[ulp]+
- iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+
- iLBCenc_inst->ULP_inst->scale_bits[ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos);
-
- for (k=0; k<iLBCenc_inst->state_short_len; k++) {
- packsplit(idxVec+k, &firstpart, idxVec+k,
- iLBCenc_inst->ULP_inst->state_bits[ulp],
- iLBCenc_inst->ULP_inst->state_bits[ulp]+
- iLBCenc_inst->ULP_inst->state_bits[ulp+1]+
- iLBCenc_inst->ULP_inst->state_bits[ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->state_bits[ulp], &pos);
- }
-
-
-
-
-
-
- /* 23/22 (20ms/30ms) sample block */
-
- for (k=0;k<CB_NSTAGES;k++) {
- packsplit(extra_cb_index+k, &firstpart,
- extra_cb_index+k,
- iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
- iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+
- iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+
- iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp],
- &pos);
- }
-
- for (k=0;k<CB_NSTAGES;k++) {
- packsplit(extra_gain_index+k, &firstpart,
- extra_gain_index+k,
- iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
- iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+
- iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+
- iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp],
- &pos);
- }
-
- /* The two/four (20ms/30ms) 40 sample sub-blocks */
-
- for (i=0; i<iLBCenc_inst->nasub; i++) {
- for (k=0; k<CB_NSTAGES; k++) {
- packsplit(cb_index+i*CB_NSTAGES+k, &firstpart,
- cb_index+i*CB_NSTAGES+k,
- iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
- iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+
- iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+
- iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->cb_index[i][k][ulp],
- &pos);
- }
- }
-
- for (i=0; i<iLBCenc_inst->nasub; i++) {
- for (k=0; k<CB_NSTAGES; k++) {
- packsplit(gain_index+i*CB_NSTAGES+k, &firstpart,
- gain_index+i*CB_NSTAGES+k,
- iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
- iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+
-
-
-
-
-
- iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+
- iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]);
- dopack( &pbytes, firstpart,
- iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp],
- &pos);
- }
- }
- }
-
- /* set the last bit to zero (otherwise the decoder
- will treat it as a lost frame) */
- dopack( &pbytes, 0, 1, &pos);
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.h b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.h
deleted file mode 100644
index a3ab55f9dcea93d6a5379933adbd4d092c7d2687..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_encode.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iLBC_encode.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_ILBCENCODE_H
- #define __iLBC_ILBCENCODE_H
-
- #include "iLBC_define.h"
-
- short initEncode( /* (o) Number of bytes
- encoded */
- iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */
- int mode /* (i) frame size mode */
- );
-
- void iLBC_encode(
-
- unsigned char *bytes, /* (o) encoded data bits iLBC */
- float *block, /* (o) speech vector to
- encode */
- iLBC_Enc_Inst_t *iLBCenc_inst /* (i/o) the general encoder
- state */
- );
-
- #endif
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_test.c b/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_test.c
deleted file mode 100644
index 81985c09a518bc6a4a390672b082f13231e3fecb..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/iLBC_test.c
+++ /dev/null
@@ -1,310 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- iLBC_test.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
- #include "iLBC_define.h"
- #include "iLBC_encode.h"
- #include "iLBC_decode.h"
-
- /* Runtime statistics */
- #include <time.h>
-
- #define ILBCNOOFWORDS_MAX (NO_OF_BYTES_30MS/2)
-
- /*----------------------------------------------------------------*
- * Encoder interface function
-
-
-
-
-
- *---------------------------------------------------------------*/
-
- short encode( /* (o) Number of bytes encoded */
- iLBC_Enc_Inst_t *iLBCenc_inst,
- /* (i/o) Encoder instance */
- short *encoded_data, /* (o) The encoded bytes */
- short *data /* (i) The signal block to encode*/
- ){
- float block[BLOCKL_MAX];
- int k;
-
- /* convert signal to float */
-
- for (k=0; k<iLBCenc_inst->blockl; k++)
- block[k] = (float)data[k];
-
- /* do the actual encoding */
-
- iLBC_encode((unsigned char *)encoded_data, block, iLBCenc_inst);
-
-
- return (iLBCenc_inst->no_of_bytes);
- }
-
- /*----------------------------------------------------------------*
- * Decoder interface function
- *---------------------------------------------------------------*/
-
- short decode( /* (o) Number of decoded samples */
- iLBC_Dec_Inst_t *iLBCdec_inst, /* (i/o) Decoder instance */
- short *decoded_data, /* (o) Decoded signal block*/
- short *encoded_data, /* (i) Encoded bytes */
- short mode /* (i) 0=PL, 1=Normal */
- ){
- int k;
- float decblock[BLOCKL_MAX], dtmp;
-
- /* check if mode is valid */
-
- if (mode<0 || mode>1) {
- printf("\nERROR - Wrong mode - 0, 1 allowed\n"); exit(3);}
-
- /* do actual decoding of block */
-
- iLBC_decode(decblock, (unsigned char *)encoded_data,
- iLBCdec_inst, mode);
-
- /* convert to short */
-
-
-
-
-
- for (k=0; k<iLBCdec_inst->blockl; k++){
- dtmp=decblock[k];
-
- if (dtmp<MIN_SAMPLE)
- dtmp=MIN_SAMPLE;
- else if (dtmp>MAX_SAMPLE)
- dtmp=MAX_SAMPLE;
- decoded_data[k] = (short) dtmp;
- }
-
- return (iLBCdec_inst->blockl);
- }
-
- /*---------------------------------------------------------------*
- * Main program to test iLBC encoding and decoding
- *
- * Usage:
- * exefile_name.exe <infile> <bytefile> <outfile> <channel>
- *
- * <infile> : Input file, speech for encoder (16-bit pcm file)
- * <bytefile> : Bit stream output from the encoder
- * <outfile> : Output file, decoded speech (16-bit pcm file)
- * <channel> : Bit error file, optional (16-bit)
- * 1 - Packet received correctly
- * 0 - Packet Lost
- *
- *--------------------------------------------------------------*/
-
- int main(int argc, char* argv[])
- {
-
- /* Runtime statistics */
-
- float starttime;
- float runtime;
- float outtime;
-
- FILE *ifileid,*efileid,*ofileid, *cfileid;
- short data[BLOCKL_MAX];
- short encoded_data[ILBCNOOFWORDS_MAX], decoded_data[BLOCKL_MAX];
- int len;
- short pli, mode;
- int blockcount = 0;
- int packetlosscount = 0;
-
- /* Create structs */
- iLBC_Enc_Inst_t Enc_Inst;
- iLBC_Dec_Inst_t Dec_Inst;
-
-
-
-
-
- /* get arguments and open files */
-
- if ((argc!=5) && (argc!=6)) {
- fprintf(stderr,
- "\n*-----------------------------------------------*\n");
- fprintf(stderr,
- " %s <20,30> input encoded decoded (channel)\n\n",
- argv[0]);
- fprintf(stderr,
- " mode : Frame size for the encoding/decoding\n");
- fprintf(stderr,
- " 20 - 20 ms\n");
- fprintf(stderr,
- " 30 - 30 ms\n");
- fprintf(stderr,
- " input : Speech for encoder (16-bit pcm file)\n");
- fprintf(stderr,
- " encoded : Encoded bit stream\n");
- fprintf(stderr,
- " decoded : Decoded speech (16-bit pcm file)\n");
- fprintf(stderr,
- " channel : Packet loss pattern, optional (16-bit)\n");
- fprintf(stderr,
- " 1 - Packet received correctly\n");
- fprintf(stderr,
- " 0 - Packet Lost\n");
- fprintf(stderr,
- "*-----------------------------------------------*\n\n");
- exit(1);
- }
- mode=atoi(argv[1]);
- if (mode != 20 && mode != 30) {
- fprintf(stderr,"Wrong mode %s, must be 20, or 30\n",
- argv[1]);
- exit(2);
- }
- if ( (ifileid=fopen(argv[2],"rb")) == NULL) {
- fprintf(stderr,"Cannot open input file %s\n", argv[2]);
- exit(2);}
- if ( (efileid=fopen(argv[3],"wb")) == NULL) {
- fprintf(stderr, "Cannot open encoded file %s\n",
- argv[3]); exit(1);}
- if ( (ofileid=fopen(argv[4],"wb")) == NULL) {
- fprintf(stderr, "Cannot open decoded file %s\n",
- argv[4]); exit(1);}
- if (argc==6) {
- if( (cfileid=fopen(argv[5],"rb")) == NULL) {
- fprintf(stderr, "Cannot open channel file %s\n",
-
-
-
-
-
- argv[5]);
- exit(1);
- }
- } else {
- cfileid=NULL;
- }
-
- /* print info */
-
- fprintf(stderr, "\n");
- fprintf(stderr,
- "*---------------------------------------------------*\n");
- fprintf(stderr,
- "* *\n");
- fprintf(stderr,
- "* iLBC test program *\n");
- fprintf(stderr,
- "* *\n");
- fprintf(stderr,
- "* *\n");
- fprintf(stderr,
- "*---------------------------------------------------*\n");
- fprintf(stderr,"\nMode : %2d ms\n", mode);
- fprintf(stderr,"Input file : %s\n", argv[2]);
- fprintf(stderr,"Encoded file : %s\n", argv[3]);
- fprintf(stderr,"Output file : %s\n", argv[4]);
- if (argc==6) {
- fprintf(stderr,"Channel file : %s\n", argv[5]);
- }
- fprintf(stderr,"\n");
-
- /* Initialization */
-
- initEncode(&Enc_Inst, mode);
- initDecode(&Dec_Inst, mode, 1);
-
- /* Runtime statistics */
-
- starttime=clock()/(float)CLOCKS_PER_SEC;
-
- /* loop over input blocks */
-
- while (fread(data,sizeof(short),Enc_Inst.blockl,ifileid)==
- (size_t)Enc_Inst.blockl) {
-
- blockcount++;
-
- /* encoding */
-
-
-
-
-
- fprintf(stderr, "--- Encoding block %i --- ",blockcount);
- len=encode(&Enc_Inst, encoded_data, data);
- fprintf(stderr, "\r");
-
- /* write byte file */
-
- fwrite(encoded_data, sizeof(unsigned char), len, efileid);
-
- /* get channel data if provided */
- if (argc==6) {
- if (fread(&pli, sizeof(short), 1, cfileid)) {
- if ((pli!=0)&&(pli!=1)) {
- fprintf(stderr, "Error in channel file\n");
- exit(0);
- }
- if (pli==0) {
- /* Packet loss -> remove info from frame */
- memset(encoded_data, 0,
- sizeof(short)*ILBCNOOFWORDS_MAX);
- packetlosscount++;
- }
- } else {
- fprintf(stderr, "Error. Channel file too short\n");
- exit(0);
- }
- } else {
- pli=1;
- }
-
- /* decoding */
-
- fprintf(stderr, "--- Decoding block %i --- ",blockcount);
-
- len=decode(&Dec_Inst, decoded_data, encoded_data, pli);
- fprintf(stderr, "\r");
-
- /* write output file */
-
- fwrite(decoded_data,sizeof(short),len,ofileid);
- }
-
- /* Runtime statistics */
-
- runtime = (float)(clock()/(float)CLOCKS_PER_SEC-starttime);
- outtime = (float)((float)blockcount*(float)mode/1000.0);
- printf("\n\nLength of speech file: %.1f s\n", outtime);
- printf("Packet loss : %.1f%%\n",
- 100.0*(float)packetlosscount/(float)blockcount);
-
-
-
-
-
- printf("Time to run iLBC :");
- printf(" %.1f s (%.1f %% of realtime)\n\n", runtime,
- (100*runtime/outtime));
-
- /* close files */
-
- fclose(ifileid); fclose(efileid); fclose(ofileid);
- if (argc==6) {
- fclose(cfileid);
- }
- return(0);
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/lsf.c b/sflphone-common/libs/pjproject/third_party/ilbc/lsf.c
deleted file mode 100644
index b4fe0eda3de10394e21f49209f7342d049a3f386..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/lsf.c
+++ /dev/null
@@ -1,283 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- lsf.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <string.h>
-
-
-
-
-
- #include <math.h>
-
- #include "iLBC_define.h"
-
- /*----------------------------------------------------------------*
- * conversion from lpc coefficients to lsf coefficients
- *---------------------------------------------------------------*/
-
- void a2lsf(
- float *freq,/* (o) lsf coefficients */
- float *a /* (i) lpc coefficients */
- ){
- float steps[LSF_NUMBER_OF_STEPS] =
- {(float)0.00635, (float)0.003175, (float)0.0015875,
- (float)0.00079375};
- float step;
- int step_idx;
- int lsp_index;
- float p[LPC_HALFORDER];
- float q[LPC_HALFORDER];
- float p_pre[LPC_HALFORDER];
- float q_pre[LPC_HALFORDER];
- float old_p, old_q, *old;
- float *pq_coef;
- float omega, old_omega;
- int i;
- float hlp, hlp1, hlp2, hlp3, hlp4, hlp5;
-
- for (i=0; i<LPC_HALFORDER; i++) {
- p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]);
- q[i] = a[LPC_FILTERORDER - i] - a[i + 1];
- }
-
- p_pre[0] = (float)-1.0 - p[0];
- p_pre[1] = - p_pre[0] - p[1];
- p_pre[2] = - p_pre[1] - p[2];
- p_pre[3] = - p_pre[2] - p[3];
- p_pre[4] = - p_pre[3] - p[4];
- p_pre[4] = p_pre[4] / 2;
-
- q_pre[0] = (float)1.0 - q[0];
- q_pre[1] = q_pre[0] - q[1];
- q_pre[2] = q_pre[1] - q[2];
- q_pre[3] = q_pre[2] - q[3];
- q_pre[4] = q_pre[3] - q[4];
- q_pre[4] = q_pre[4] / 2;
-
- omega = 0.0;
-
-
-
-
-
- old_omega = 0.0;
-
- old_p = FLOAT_MAX;
- old_q = FLOAT_MAX;
-
- /* Here we loop through lsp_index to find all the
- LPC_FILTERORDER roots for omega. */
-
- for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) {
-
- /* Depending on lsp_index being even or odd, we
- alternatively solve the roots for the two LSP equations. */
-
-
- if ((lsp_index & 0x1) == 0) {
- pq_coef = p_pre;
- old = &old_p;
- } else {
- pq_coef = q_pre;
- old = &old_q;
- }
-
- /* Start with low resolution grid */
-
- for (step_idx = 0, step = steps[step_idx];
- step_idx < LSF_NUMBER_OF_STEPS;){
-
- /* cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) +
- pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */
-
- hlp = (float)cos(omega * TWO_PI);
- hlp1 = (float)2.0 * hlp + pq_coef[0];
- hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 +
- pq_coef[1];
- hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2];
- hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3];
- hlp5 = hlp * hlp4 - hlp3 + pq_coef[4];
-
-
- if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){
-
- if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){
-
- if (fabs(hlp5) >= fabs(*old)) {
- freq[lsp_index] = omega - step;
- } else {
- freq[lsp_index] = omega;
- }
-
-
-
-
-
-
-
- if ((*old) >= 0.0){
- *old = (float)-1.0 * FLOAT_MAX;
- } else {
- *old = FLOAT_MAX;
- }
-
- omega = old_omega;
- step_idx = 0;
-
- step_idx = LSF_NUMBER_OF_STEPS;
- } else {
-
- if (step_idx == 0) {
- old_omega = omega;
- }
-
- step_idx++;
- omega -= steps[step_idx];
-
- /* Go back one grid step */
-
- step = steps[step_idx];
- }
- } else {
-
- /* increment omega until they are of different sign,
- and we know there is at least one root between omega
- and old_omega */
- *old = hlp5;
- omega += step;
- }
- }
- }
-
- for (i = 0; i<LPC_FILTERORDER; i++) {
- freq[i] = freq[i] * TWO_PI;
- }
- }
-
- /*----------------------------------------------------------------*
- * conversion from lsf coefficients to lpc coefficients
- *---------------------------------------------------------------*/
-
- void lsf2a(
- float *a_coef, /* (o) lpc coefficients */
- float *freq /* (i) lsf coefficients */
-
-
-
-
-
- ){
- int i, j;
- float hlp;
- float p[LPC_HALFORDER], q[LPC_HALFORDER];
- float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER],
- a2[LPC_HALFORDER];
- float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER],
- b2[LPC_HALFORDER];
-
- for (i=0; i<LPC_FILTERORDER; i++) {
- freq[i] = freq[i] * PI2;
- }
-
- /* Check input for ill-conditioned cases. This part is not
- found in the TIA standard. It involves the following 2 IF
- blocks. If "freq" is judged ill-conditioned, then we first
- modify freq[0] and freq[LPC_HALFORDER-1] (normally
- LPC_HALFORDER = 10 for LPC applications), then we adjust
- the other "freq" values slightly */
-
-
- if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){
-
-
- if (freq[0] <= 0.0) {
- freq[0] = (float)0.022;
- }
-
-
- if (freq[LPC_FILTERORDER - 1] >= 0.5) {
- freq[LPC_FILTERORDER - 1] = (float)0.499;
- }
-
- hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) /
- (float) (LPC_FILTERORDER - 1);
-
- for (i=1; i<LPC_FILTERORDER; i++) {
- freq[i] = freq[i - 1] + hlp;
- }
- }
-
- memset(a1, 0, LPC_HALFORDER*sizeof(float));
- memset(a2, 0, LPC_HALFORDER*sizeof(float));
- memset(b1, 0, LPC_HALFORDER*sizeof(float));
- memset(b2, 0, LPC_HALFORDER*sizeof(float));
- memset(a, 0, (LPC_HALFORDER+1)*sizeof(float));
- memset(b, 0, (LPC_HALFORDER+1)*sizeof(float));
-
-
-
-
-
-
- /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and
- cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2.
- Note that for this code p[i] specifies the coefficients
- used in .Q_A(z) while q[i] specifies the coefficients used
- in .P_A(z) */
-
- for (i=0; i<LPC_HALFORDER; i++) {
- p[i] = (float)cos(TWO_PI * freq[2 * i]);
- q[i] = (float)cos(TWO_PI * freq[2 * i + 1]);
- }
-
- a[0] = 0.25;
- b[0] = 0.25;
-
- for (i= 0; i<LPC_HALFORDER; i++) {
- a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
- b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
- a2[i] = a1[i];
- a1[i] = a[i];
- b2[i] = b1[i];
- b1[i] = b[i];
- }
-
- for (j=0; j<LPC_FILTERORDER; j++) {
-
- if (j == 0) {
- a[0] = 0.25;
- b[0] = -0.25;
- } else {
- a[0] = b[0] = 0.0;
- }
-
- for (i=0; i<LPC_HALFORDER; i++) {
- a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
- b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
- a2[i] = a1[i];
- a1[i] = a[i];
- b2[i] = b1[i];
- b1[i] = b[i];
- }
-
- a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]);
- }
-
- a_coef[0] = 1.0;
- }
-
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/lsf.h b/sflphone-common/libs/pjproject/third_party/ilbc/lsf.h
deleted file mode 100644
index caff77ec0d6fd3428297f5fd07efa98b23788088..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/lsf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- lsf.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_LSF_H
- #define __iLBC_LSF_H
-
- void a2lsf(
- float *freq,/* (o) lsf coefficients */
- float *a /* (i) lpc coefficients */
- );
-
- void lsf2a(
- float *a_coef, /* (o) lpc coefficients */
- float *freq /* (i) lsf coefficients */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/packing.c b/sflphone-common/libs/pjproject/third_party/ilbc/packing.c
deleted file mode 100644
index b7496a48eaa72f3034e53936a7d022be12fc79e7..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/packing.c
+++ /dev/null
@@ -1,182 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- packing.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include <math.h>
- #include <stdlib.h>
-
- #include "iLBC_define.h"
- #include "constants.h"
- #include "helpfun.h"
- #include "string.h"
-
- /*----------------------------------------------------------------*
- * splitting an integer into first most significant bits and
- * remaining least significant bits
- *---------------------------------------------------------------*/
-
- void packsplit(
- int *index, /* (i) the value to split */
- int *firstpart, /* (o) the value specified by most
- significant bits */
- int *rest, /* (o) the value specified by least
- significant bits */
-
-
-
-
-
- int bitno_firstpart, /* (i) number of bits in most
- significant part */
- int bitno_total /* (i) number of bits in full range
- of value */
- ){
- int bitno_rest = bitno_total-bitno_firstpart;
-
- *firstpart = *index>>(bitno_rest);
- *rest = *index-(*firstpart<<(bitno_rest));
- }
-
- /*----------------------------------------------------------------*
- * combining a value corresponding to msb's with a value
- * corresponding to lsb's
- *---------------------------------------------------------------*/
-
- void packcombine(
- int *index, /* (i/o) the msb value in the
- combined value out */
- int rest, /* (i) the lsb value */
- int bitno_rest /* (i) the number of bits in the
- lsb part */
- ){
- *index = *index<<bitno_rest;
- *index += rest;
- }
-
- /*----------------------------------------------------------------*
- * packing of bits into bitstream, i.e., vector of bytes
- *---------------------------------------------------------------*/
-
- void dopack(
- unsigned char **bitstream, /* (i/o) on entrance pointer to
- place in bitstream to pack
- new data, on exit pointer
- to place in bitstream to
- pack future data */
- int index, /* (i) the value to pack */
- int bitno, /* (i) the number of bits that the
- value will fit within */
- int *pos /* (i/o) write position in the
- current byte */
- ){
- int posLeft;
-
- /* Clear the bits before starting in a new byte */
-
- if ((*pos)==0) {
-
-
-
-
-
- **bitstream=0;
- }
-
- while (bitno>0) {
-
- /* Jump to the next byte if end of this byte is reached*/
-
- if (*pos==8) {
- *pos=0;
- (*bitstream)++;
- **bitstream=0;
- }
-
- posLeft=8-(*pos);
-
- /* Insert index into the bitstream */
-
- if (bitno <= posLeft) {
- **bitstream |= (unsigned char)(index<<(posLeft-bitno));
- *pos+=bitno;
- bitno=0;
- } else {
- **bitstream |= (unsigned char)(index>>(bitno-posLeft));
-
- *pos=8;
- index-=((index>>(bitno-posLeft))<<(bitno-posLeft));
-
- bitno-=posLeft;
- }
- }
- }
-
- /*----------------------------------------------------------------*
- * unpacking of bits from bitstream, i.e., vector of bytes
- *---------------------------------------------------------------*/
-
- void unpack(
- unsigned char **bitstream, /* (i/o) on entrance pointer to
- place in bitstream to
- unpack new data from, on
- exit pointer to place in
- bitstream to unpack future
- data from */
- int *index, /* (o) resulting value */
- int bitno, /* (i) number of bits used to
- represent the value */
- int *pos /* (i/o) read position in the
- current byte */
-
-
-
-
-
- ){
- int BitsLeft;
-
- *index=0;
-
- while (bitno>0) {
-
- /* move forward in bitstream when the end of the
- byte is reached */
-
- if (*pos==8) {
- *pos=0;
- (*bitstream)++;
- }
-
- BitsLeft=8-(*pos);
-
- /* Extract bits to index */
-
- if (BitsLeft>=bitno) {
- *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno));
-
- *pos+=bitno;
- bitno=0;
- } else {
-
- if ((8-bitno)>0) {
- *index+=((((**bitstream)<<(*pos)) & 0xFF)>>
- (8-bitno));
- *pos=8;
- } else {
- *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<<
- (bitno-8));
- *pos=8;
- }
- bitno-=BitsLeft;
- }
- }
- }
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/packing.h b/sflphone-common/libs/pjproject/third_party/ilbc/packing.h
deleted file mode 100644
index cbb9f82dfd24411a2edc41c843b2f4f9ad046e23..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/packing.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- packing.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __PACKING_H
- #define __PACKING_H
-
- void packsplit(
- int *index, /* (i) the value to split */
- int *firstpart, /* (o) the value specified by most
- significant bits */
- int *rest, /* (o) the value specified by least
- significant bits */
- int bitno_firstpart, /* (i) number of bits in most
- significant part */
- int bitno_total /* (i) number of bits in full range
- of value */
- );
-
- void packcombine(
- int *index, /* (i/o) the msb value in the
- combined value out */
- int rest, /* (i) the lsb value */
- int bitno_rest /* (i) the number of bits in the
- lsb part */
- );
-
- void dopack(
- unsigned char **bitstream, /* (i/o) on entrance pointer to
- place in bitstream to pack
- new data, on exit pointer
- to place in bitstream to
- pack future data */
- int index, /* (i) the value to pack */
- int bitno, /* (i) the number of bits that the
- value will fit within */
- int *pos /* (i/o) write position in the
- current byte */
- );
-
-
-
-
-
- void unpack(
- unsigned char **bitstream, /* (i/o) on entrance pointer to
- place in bitstream to
- unpack new data from, on
- exit pointer to place in
- bitstream to unpack future
- data from */
- int *index, /* (o) resulting value */
- int bitno, /* (i) number of bits used to
- represent the value */
- int *pos /* (i/o) read position in the
- current byte */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.c b/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.c
deleted file mode 100644
index 190eb009db7029d1cc5bfe8740d5fe153c0d5da0..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.c
+++ /dev/null
@@ -1,80 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- syntFilter.c
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #include "iLBC_define.h"
-
- /*----------------------------------------------------------------*
- * LP synthesis filter.
- *---------------------------------------------------------------*/
-
- void syntFilter(
- float *Out, /* (i/o) Signal to be filtered */
- float *a, /* (i) LP parameters */
- int len, /* (i) Length of signal */
-
-
-
-
-
- float *mem /* (i/o) Filter state */
- ){
- int i, j;
- float *po, *pi, *pa, *pm;
-
- po=Out;
-
- /* Filter first part using memory from past */
-
- for (i=0; i<LPC_FILTERORDER; i++) {
- pi=&Out[i-1];
- pa=&a[1];
- pm=&mem[LPC_FILTERORDER-1];
- for (j=1; j<=i; j++) {
- *po-=(*pa++)*(*pi--);
- }
- for (j=i+1; j<LPC_FILTERORDER+1; j++) {
- *po-=(*pa++)*(*pm--);
- }
- po++;
- }
-
- /* Filter last part where the state is entirely in
- the output vector */
-
- for (i=LPC_FILTERORDER; i<len; i++) {
- pi=&Out[i-1];
- pa=&a[1];
- for (j=1; j<LPC_FILTERORDER+1; j++) {
- *po-=(*pa++)*(*pi--);
- }
- po++;
- }
-
- /* Update state vector */
-
- memcpy(mem, &Out[len-LPC_FILTERORDER],
- LPC_FILTERORDER*sizeof(float));
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.h b/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.h
deleted file mode 100644
index 8865b8917fa97c43326ab1d908ea3a13c68fbddb..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/ilbc/syntFilter.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
- /******************************************************************
-
- iLBC Speech Coder ANSI-C Source Code
-
- syntFilter.h
-
- Copyright (C) The Internet Society (2004).
- All Rights Reserved.
-
- ******************************************************************/
-
- #ifndef __iLBC_SYNTFILTER_H
- #define __iLBC_SYNTFILTER_H
-
- void syntFilter(
- float *Out, /* (i/o) Signal to be filtered */
- float *a, /* (i) LP parameters */
- int len, /* (i) Length of signal */
- float *mem /* (i/o) Filter state */
- );
-
- #endif
-
diff --git a/sflphone-common/libs/pjproject/third_party/milenage/milenage.c b/sflphone-common/libs/pjproject/third_party/milenage/milenage.c
deleted file mode 100644
index 66dae9bb10947bc3b5352a6f499c1c0954eab83d..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/milenage/milenage.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*-------------------------------------------------------------------
- * Example algorithms f1, f1*, f2, f3, f4, f5, f5*
- *-------------------------------------------------------------------
- *
- * A sample implementation of the example 3GPP authentication and
- * key agreement functions f1, f1*, f2, f3, f4, f5 and f5*. This is
- * a byte-oriented implementation of the functions, and of the block
- * cipher kernel function Rijndael.
- *
- * This has been coded for clarity, not necessarily for efficiency.
- *
- * The functions f2, f3, f4 and f5 share the same inputs and have
- * been coded together as a single function. f1, f1* and f5* are
- * all coded separately.
- *
- *-----------------------------------------------------------------*/
-
-#include "milenage.h"
-#include "rijndael.h"
-
-/*--------------------------- prototypes --------------------------*/
-
-
-
-/*-------------------------------------------------------------------
- * Algorithm f1
- *-------------------------------------------------------------------
- *
- * Computes network authentication code MAC-A from key K, random
- * challenge RAND, sequence number SQN and authentication management
- * field AMF.
- *
- *-----------------------------------------------------------------*/
-
-void f1 ( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2],
- u8 mac_a[8], u8 op[16] )
-{
- u8 op_c[16];
- u8 temp[16];
- u8 in1[16];
- u8 out1[16];
- u8 rijndaelInput[16];
- u8 i;
-
- RijndaelKeySchedule( k );
-
- ComputeOPc( op_c, op );
-
- for (i=0; i<16; i++)
- rijndaelInput[i] = rand[i] ^ op_c[i];
- RijndaelEncrypt( rijndaelInput, temp );
-
- for (i=0; i<6; i++)
- {
- in1[i] = sqn[i];
- in1[i+8] = sqn[i];
- }
- for (i=0; i<2; i++)
- {
- in1[i+6] = amf[i];
- in1[i+14] = amf[i];
- }
-
- /* XOR op_c and in1, rotate by r1=64, and XOR *
- * on the constant c1 (which is all zeroes) */
-
- for (i=0; i<16; i++)
- rijndaelInput[(i+8) % 16] = in1[i] ^ op_c[i];
-
- /* XOR on the value temp computed before */
-
- for (i=0; i<16; i++)
- rijndaelInput[i] ^= temp[i];
-
- RijndaelEncrypt( rijndaelInput, out1 );
- for (i=0; i<16; i++)
- out1[i] ^= op_c[i];
-
- for (i=0; i<8; i++)
- mac_a[i] = out1[i];
-
- return;
-} /* end of function f1 */
-
-
-
-/*-------------------------------------------------------------------
- * Algorithms f2-f5
- *-------------------------------------------------------------------
- *
- * Takes key K and random challenge RAND, and returns response RES,
- * confidentiality key CK, integrity key IK and anonymity key AK.
- *
- *-----------------------------------------------------------------*/
-
-void f2345 ( u8 k[16], u8 rand[16],
- u8 res[8], u8 ck[16], u8 ik[16], u8 ak[6], u8 op[16] )
-{
- u8 op_c[16];
- u8 temp[16];
- u8 out[16];
- u8 rijndaelInput[16];
- u8 i;
-
- RijndaelKeySchedule( k );
-
- ComputeOPc( op_c, op );
-
- for (i=0; i<16; i++)
- rijndaelInput[i] = rand[i] ^ op_c[i];
- RijndaelEncrypt( rijndaelInput, temp );
-
- /* To obtain output block OUT2: XOR OPc and TEMP, *
- * rotate by r2=0, and XOR on the constant c2 (which *
- * is all zeroes except that the last bit is 1). */
-
- for (i=0; i<16; i++)
- rijndaelInput[i] = temp[i] ^ op_c[i];
- rijndaelInput[15] ^= 1;
-
- RijndaelEncrypt( rijndaelInput, out );
- for (i=0; i<16; i++)
- out[i] ^= op_c[i];
-
- for (i=0; i<8; i++)
- res[i] = out[i+8];
- for (i=0; i<6; i++)
- ak[i] = out[i];
-
- /* To obtain output block OUT3: XOR OPc and TEMP, *
- * rotate by r3=32, and XOR on the constant c3 (which *
- * is all zeroes except that the next to last bit is 1). */
-
- for (i=0; i<16; i++)
- rijndaelInput[(i+12) % 16] = temp[i] ^ op_c[i];
- rijndaelInput[15] ^= 2;
-
- RijndaelEncrypt( rijndaelInput, out );
- for (i=0; i<16; i++)
- out[i] ^= op_c[i];
-
- for (i=0; i<16; i++)
- ck[i] = out[i];
-
- /* To obtain output block OUT4: XOR OPc and TEMP, *
- * rotate by r4=64, and XOR on the constant c4 (which *
- * is all zeroes except that the 2nd from last bit is 1). */
-
- for (i=0; i<16; i++)
- rijndaelInput[(i+8) % 16] = temp[i] ^ op_c[i];
- rijndaelInput[15] ^= 4;
-
- RijndaelEncrypt( rijndaelInput, out );
- for (i=0; i<16; i++)
- out[i] ^= op_c[i];
-
- for (i=0; i<16; i++)
- ik[i] = out[i];
-
- return;
-} /* end of function f2345 */
-
-
-/*-------------------------------------------------------------------
- * Algorithm f1*
- *-------------------------------------------------------------------
- *
- * Computes resynch authentication code MAC-S from key K, random
- * challenge RAND, sequence number SQN and authentication management
- * field AMF.
- *
- *-----------------------------------------------------------------*/
-
-void f1star( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2],
- u8 mac_s[8], u8 op[16] )
-{
- u8 op_c[16];
- u8 temp[16];
- u8 in1[16];
- u8 out1[16];
- u8 rijndaelInput[16];
- u8 i;
-
- RijndaelKeySchedule( k );
-
- ComputeOPc( op_c, op );
-
- for (i=0; i<16; i++)
- rijndaelInput[i] = rand[i] ^ op_c[i];
- RijndaelEncrypt( rijndaelInput, temp );
-
- for (i=0; i<6; i++)
- {
- in1[i] = sqn[i];
- in1[i+8] = sqn[i];
- }
- for (i=0; i<2; i++)
- {
- in1[i+6] = amf[i];
- in1[i+14] = amf[i];
- }
-
- /* XOR op_c and in1, rotate by r1=64, and XOR *
- * on the constant c1 (which is all zeroes) */
-
- for (i=0; i<16; i++)
- rijndaelInput[(i+8) % 16] = in1[i] ^ op_c[i];
-
- /* XOR on the value temp computed before */
-
- for (i=0; i<16; i++)
- rijndaelInput[i] ^= temp[i];
-
- RijndaelEncrypt( rijndaelInput, out1 );
- for (i=0; i<16; i++)
- out1[i] ^= op_c[i];
-
- for (i=0; i<8; i++)
- mac_s[i] = out1[i+8];
-
- return;
-} /* end of function f1star */
-
-
-/*-------------------------------------------------------------------
- * Algorithm f5*
- *-------------------------------------------------------------------
- *
- * Takes key K and random challenge RAND, and returns resynch
- * anonymity key AK.
- *
- *-----------------------------------------------------------------*/
-
-void f5star( u8 k[16], u8 rand[16],
- u8 ak[6], u8 op[16] )
-{
- u8 op_c[16];
- u8 temp[16];
- u8 out[16];
- u8 rijndaelInput[16];
- u8 i;
-
- RijndaelKeySchedule( k );
-
- ComputeOPc( op_c, op );
-
- for (i=0; i<16; i++)
- rijndaelInput[i] = rand[i] ^ op_c[i];
- RijndaelEncrypt( rijndaelInput, temp );
-
- /* To obtain output block OUT5: XOR OPc and TEMP, *
- * rotate by r5=96, and XOR on the constant c5 (which *
- * is all zeroes except that the 3rd from last bit is 1). */
-
- for (i=0; i<16; i++)
- rijndaelInput[(i+4) % 16] = temp[i] ^ op_c[i];
- rijndaelInput[15] ^= 8;
-
- RijndaelEncrypt( rijndaelInput, out );
- for (i=0; i<16; i++)
- out[i] ^= op_c[i];
-
- for (i=0; i<6; i++)
- ak[i] = out[i];
-
- return;
-} /* end of function f5star */
-
-
-/*-------------------------------------------------------------------
- * Function to compute OPc from OP and K. Assumes key schedule has
- already been performed.
- *-----------------------------------------------------------------*/
-
-void ComputeOPc( u8 op_c[16], u8 op[16] )
-{
- u8 i;
-
- RijndaelEncrypt( op, op_c );
- for (i=0; i<16; i++)
- op_c[i] ^= op[i];
-
- return;
-} /* end of function ComputeOPc */
diff --git a/sflphone-common/libs/pjproject/third_party/milenage/milenage.h b/sflphone-common/libs/pjproject/third_party/milenage/milenage.h
deleted file mode 100644
index a5f407f3787266cb0d90c08bc2b8c15e31704950..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/milenage/milenage.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-------------------------------------------------------------------
- * Example algorithms f1, f1*, f2, f3, f4, f5, f5*
- *-------------------------------------------------------------------
- *
- * A sample implementation of the example 3GPP authentication and
- * key agreement functions f1, f1*, f2, f3, f4, f5 and f5*. This is
- * a byte-oriented implementation of the functions, and of the block
- * cipher kernel function Rijndael.
- *
- * This has been coded for clarity, not necessarily for efficiency.
- *
- * The functions f2, f3, f4 and f5 share the same inputs and have
- * been coded together as a single function. f1, f1* and f5* are
- * all coded separately.
- *
- *-----------------------------------------------------------------*/
-
-#ifndef MILENAGE_H
-#define MILENAGE_H
-
-typedef unsigned char u8;
-
-
-void f1 ( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2],
- u8 mac_a[8], u8 op[16] );
-void f2345 ( u8 k[16], u8 rand[16],
- u8 res[8], u8 ck[16], u8 ik[16], u8 ak[6], u8 op[16] );
-void f1star( u8 k[16], u8 rand[16], u8 sqn[6], u8 amf[2],
- u8 mac_s[8], u8 op[16] );
-void f5star( u8 k[16], u8 rand[16],
- u8 ak[6], u8 op[16] );
-void ComputeOPc( u8 op_c[16], u8 op[16] );
-
-
-#endif
diff --git a/sflphone-common/libs/pjproject/third_party/milenage/rijndael.c b/sflphone-common/libs/pjproject/third_party/milenage/rijndael.c
deleted file mode 100644
index 86557b92e4e57f1f706f82a4943a8183b6e40f70..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/milenage/rijndael.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/*-------------------------------------------------------------------
- * Rijndael Implementation
- *-------------------------------------------------------------------
- *
- * A sample 32-bit orientated implementation of Rijndael, the
- * suggested kernel for the example 3GPP authentication and key
- * agreement functions.
- *
- * This implementation draws on the description in section 5.2 of
- * the AES proposal and also on the implementation by
- * Dr B. R. Gladman <brg@gladman.uk.net> 9th October 2000.
- * It uses a number of large (4k) lookup tables to implement the
- * algorithm in an efficient manner.
- *
- * Note: in this implementation the State is stored in four 32-bit
- * words, one per column of the State, with the top byte of the
- * column being the _least_ significant byte of the word.
- *
-*-----------------------------------------------------------------*/
-
-#include <pj/types.h>
-
-#if defined(PJ_IS_LITTLE_ENDIAN) && PJ_IS_LITTLE_ENDIAN != 0
-# define LITTLE_ENDIAN /* For INTEL architecture */
-#endif
-
-typedef unsigned char u8;
-typedef unsigned int u32;
-
-/* Circular byte rotates of 32 bit values */
-
-#define rot1(x) ((x << 8) | (x >> 24))
-#define rot2(x) ((x << 16) | (x >> 16))
-#define rot3(x) ((x << 24) | (x >> 8))
-
-/* Extract a byte from a 32-bit u32 */
-
-#define byte0(x) ((u8)(x))
-#define byte1(x) ((u8)(x >> 8))
-#define byte2(x) ((u8)(x >> 16))
-#define byte3(x) ((u8)(x >> 24))
-
-
-/* Put or get a 32 bit u32 (v) in machine order from a byte *
- * address in (x) */
-
-#ifdef LITTLE_ENDIAN
-
-#define u32_in(x) (*(u32*)(x))
-#define u32_out(x,y) (*(u32*)(x) = y)
-
-#else
-
-/* Invert byte order in a 32 bit variable */
-
-__inline u32 byte_swap(const u32 x)
-{
- return rot1(x) & 0x00ff00ff | rot3(x) & 0xff00ff00;
-}
-__inline u32 u32_in(const u8 x[])
-{
- return byte_swap(*(u32*)x);
-};
-__inline void u32_out(u8 x[], const u32 v)
-{
- *(u32*)x = byte_swap(v);
-};
-
-#endif
-
-/*--------------- The lookup tables ----------------------------*/
-
-static u32 rnd_con[10] =
-{
- 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36
-};
-
-static u32 ft_tab[4][256] =
-{
- {
- 0xA56363C6,0x847C7CF8,0x997777EE,0x8D7B7BF6,0x0DF2F2FF,0xBD6B6BD6,0xB16F6FDE,0x54C5C591,
- 0x50303060,0x03010102,0xA96767CE,0x7D2B2B56,0x19FEFEE7,0x62D7D7B5,0xE6ABAB4D,0x9A7676EC,
- 0x45CACA8F,0x9D82821F,0x40C9C989,0x877D7DFA,0x15FAFAEF,0xEB5959B2,0xC947478E,0x0BF0F0FB,
- 0xECADAD41,0x67D4D4B3,0xFDA2A25F,0xEAAFAF45,0xBF9C9C23,0xF7A4A453,0x967272E4,0x5BC0C09B,
- 0xC2B7B775,0x1CFDFDE1,0xAE93933D,0x6A26264C,0x5A36366C,0x413F3F7E,0x02F7F7F5,0x4FCCCC83,
- 0x5C343468,0xF4A5A551,0x34E5E5D1,0x08F1F1F9,0x937171E2,0x73D8D8AB,0x53313162,0x3F15152A,
- 0x0C040408,0x52C7C795,0x65232346,0x5EC3C39D,0x28181830,0xA1969637,0x0F05050A,0xB59A9A2F,
- 0x0907070E,0x36121224,0x9B80801B,0x3DE2E2DF,0x26EBEBCD,0x6927274E,0xCDB2B27F,0x9F7575EA,
- 0x1B090912,0x9E83831D,0x742C2C58,0x2E1A1A34,0x2D1B1B36,0xB26E6EDC,0xEE5A5AB4,0xFBA0A05B,
- 0xF65252A4,0x4D3B3B76,0x61D6D6B7,0xCEB3B37D,0x7B292952,0x3EE3E3DD,0x712F2F5E,0x97848413,
- 0xF55353A6,0x68D1D1B9,0000000000,0x2CEDEDC1,0x60202040,0x1FFCFCE3,0xC8B1B179,0xED5B5BB6,
- 0xBE6A6AD4,0x46CBCB8D,0xD9BEBE67,0x4B393972,0xDE4A4A94,0xD44C4C98,0xE85858B0,0x4ACFCF85,
- 0x6BD0D0BB,0x2AEFEFC5,0xE5AAAA4F,0x16FBFBED,0xC5434386,0xD74D4D9A,0x55333366,0x94858511,
- 0xCF45458A,0x10F9F9E9,0x06020204,0x817F7FFE,0xF05050A0,0x443C3C78,0xBA9F9F25,0xE3A8A84B,
- 0xF35151A2,0xFEA3A35D,0xC0404080,0x8A8F8F05,0xAD92923F,0xBC9D9D21,0x48383870,0x04F5F5F1,
- 0xDFBCBC63,0xC1B6B677,0x75DADAAF,0x63212142,0x30101020,0x1AFFFFE5,0x0EF3F3FD,0x6DD2D2BF,
- 0x4CCDCD81,0x140C0C18,0x35131326,0x2FECECC3,0xE15F5FBE,0xA2979735,0xCC444488,0x3917172E,
- 0x57C4C493,0xF2A7A755,0x827E7EFC,0x473D3D7A,0xAC6464C8,0xE75D5DBA,0x2B191932,0x957373E6,
- 0xA06060C0,0x98818119,0xD14F4F9E,0x7FDCDCA3,0x66222244,0x7E2A2A54,0xAB90903B,0x8388880B,
- 0xCA46468C,0x29EEEEC7,0xD3B8B86B,0x3C141428,0x79DEDEA7,0xE25E5EBC,0x1D0B0B16,0x76DBDBAD,
- 0x3BE0E0DB,0x56323264,0x4E3A3A74,0x1E0A0A14,0xDB494992,0x0A06060C,0x6C242448,0xE45C5CB8,
- 0x5DC2C29F,0x6ED3D3BD,0xEFACAC43,0xA66262C4,0xA8919139,0xA4959531,0x37E4E4D3,0x8B7979F2,
- 0x32E7E7D5,0x43C8C88B,0x5937376E,0xB76D6DDA,0x8C8D8D01,0x64D5D5B1,0xD24E4E9C,0xE0A9A949,
- 0xB46C6CD8,0xFA5656AC,0x07F4F4F3,0x25EAEACF,0xAF6565CA,0x8E7A7AF4,0xE9AEAE47,0x18080810,
- 0xD5BABA6F,0x887878F0,0x6F25254A,0x722E2E5C,0x241C1C38,0xF1A6A657,0xC7B4B473,0x51C6C697,
- 0x23E8E8CB,0x7CDDDDA1,0x9C7474E8,0x211F1F3E,0xDD4B4B96,0xDCBDBD61,0x868B8B0D,0x858A8A0F,
- 0x907070E0,0x423E3E7C,0xC4B5B571,0xAA6666CC,0xD8484890,0x05030306,0x01F6F6F7,0x120E0E1C,
- 0xA36161C2,0x5F35356A,0xF95757AE,0xD0B9B969,0x91868617,0x58C1C199,0x271D1D3A,0xB99E9E27,
- 0x38E1E1D9,0x13F8F8EB,0xB398982B,0x33111122,0xBB6969D2,0x70D9D9A9,0x898E8E07,0xA7949433,
- 0xB69B9B2D,0x221E1E3C,0x92878715,0x20E9E9C9,0x49CECE87,0xFF5555AA,0x78282850,0x7ADFDFA5,
- 0x8F8C8C03,0xF8A1A159,0x80898909,0x170D0D1A,0xDABFBF65,0x31E6E6D7,0xC6424284,0xB86868D0,
- 0xC3414182,0xB0999929,0x772D2D5A,0x110F0F1E,0xCBB0B07B,0xFC5454A8,0xD6BBBB6D,0x3A16162C
- },
- {
- 0x6363C6A5,0x7C7CF884,0x7777EE99,0x7B7BF68D,0xF2F2FF0D,0x6B6BD6BD,0x6F6FDEB1,0xC5C59154,
- 0x30306050,0x01010203,0x6767CEA9,0x2B2B567D,0xFEFEE719,0xD7D7B562,0xABAB4DE6,0x7676EC9A,
- 0xCACA8F45,0x82821F9D,0xC9C98940,0x7D7DFA87,0xFAFAEF15,0x5959B2EB,0x47478EC9,0xF0F0FB0B,
- 0xADAD41EC,0xD4D4B367,0xA2A25FFD,0xAFAF45EA,0x9C9C23BF,0xA4A453F7,0x7272E496,0xC0C09B5B,
- 0xB7B775C2,0xFDFDE11C,0x93933DAE,0x26264C6A,0x36366C5A,0x3F3F7E41,0xF7F7F502,0xCCCC834F,
- 0x3434685C,0xA5A551F4,0xE5E5D134,0xF1F1F908,0x7171E293,0xD8D8AB73,0x31316253,0x15152A3F,
- 0x0404080C,0xC7C79552,0x23234665,0xC3C39D5E,0x18183028,0x969637A1,0x05050A0F,0x9A9A2FB5,
- 0x07070E09,0x12122436,0x80801B9B,0xE2E2DF3D,0xEBEBCD26,0x27274E69,0xB2B27FCD,0x7575EA9F,
- 0x0909121B,0x83831D9E,0x2C2C5874,0x1A1A342E,0x1B1B362D,0x6E6EDCB2,0x5A5AB4EE,0xA0A05BFB,
- 0x5252A4F6,0x3B3B764D,0xD6D6B761,0xB3B37DCE,0x2929527B,0xE3E3DD3E,0x2F2F5E71,0x84841397,
- 0x5353A6F5,0xD1D1B968,0000000000,0xEDEDC12C,0x20204060,0xFCFCE31F,0xB1B179C8,0x5B5BB6ED,
- 0x6A6AD4BE,0xCBCB8D46,0xBEBE67D9,0x3939724B,0x4A4A94DE,0x4C4C98D4,0x5858B0E8,0xCFCF854A,
- 0xD0D0BB6B,0xEFEFC52A,0xAAAA4FE5,0xFBFBED16,0x434386C5,0x4D4D9AD7,0x33336655,0x85851194,
- 0x45458ACF,0xF9F9E910,0x02020406,0x7F7FFE81,0x5050A0F0,0x3C3C7844,0x9F9F25BA,0xA8A84BE3,
- 0x5151A2F3,0xA3A35DFE,0x404080C0,0x8F8F058A,0x92923FAD,0x9D9D21BC,0x38387048,0xF5F5F104,
- 0xBCBC63DF,0xB6B677C1,0xDADAAF75,0x21214263,0x10102030,0xFFFFE51A,0xF3F3FD0E,0xD2D2BF6D,
- 0xCDCD814C,0x0C0C1814,0x13132635,0xECECC32F,0x5F5FBEE1,0x979735A2,0x444488CC,0x17172E39,
- 0xC4C49357,0xA7A755F2,0x7E7EFC82,0x3D3D7A47,0x6464C8AC,0x5D5DBAE7,0x1919322B,0x7373E695,
- 0x6060C0A0,0x81811998,0x4F4F9ED1,0xDCDCA37F,0x22224466,0x2A2A547E,0x90903BAB,0x88880B83,
- 0x46468CCA,0xEEEEC729,0xB8B86BD3,0x1414283C,0xDEDEA779,0x5E5EBCE2,0x0B0B161D,0xDBDBAD76,
- 0xE0E0DB3B,0x32326456,0x3A3A744E,0x0A0A141E,0x494992DB,0x06060C0A,0x2424486C,0x5C5CB8E4,
- 0xC2C29F5D,0xD3D3BD6E,0xACAC43EF,0x6262C4A6,0x919139A8,0x959531A4,0xE4E4D337,0x7979F28B,
- 0xE7E7D532,0xC8C88B43,0x37376E59,0x6D6DDAB7,0x8D8D018C,0xD5D5B164,0x4E4E9CD2,0xA9A949E0,
- 0x6C6CD8B4,0x5656ACFA,0xF4F4F307,0xEAEACF25,0x6565CAAF,0x7A7AF48E,0xAEAE47E9,0x08081018,
- 0xBABA6FD5,0x7878F088,0x25254A6F,0x2E2E5C72,0x1C1C3824,0xA6A657F1,0xB4B473C7,0xC6C69751,
- 0xE8E8CB23,0xDDDDA17C,0x7474E89C,0x1F1F3E21,0x4B4B96DD,0xBDBD61DC,0x8B8B0D86,0x8A8A0F85,
- 0x7070E090,0x3E3E7C42,0xB5B571C4,0x6666CCAA,0x484890D8,0x03030605,0xF6F6F701,0x0E0E1C12,
- 0x6161C2A3,0x35356A5F,0x5757AEF9,0xB9B969D0,0x86861791,0xC1C19958,0x1D1D3A27,0x9E9E27B9,
- 0xE1E1D938,0xF8F8EB13,0x98982BB3,0x11112233,0x6969D2BB,0xD9D9A970,0x8E8E0789,0x949433A7,
- 0x9B9B2DB6,0x1E1E3C22,0x87871592,0xE9E9C920,0xCECE8749,0x5555AAFF,0x28285078,0xDFDFA57A,
- 0x8C8C038F,0xA1A159F8,0x89890980,0x0D0D1A17,0xBFBF65DA,0xE6E6D731,0x424284C6,0x6868D0B8,
- 0x414182C3,0x999929B0,0x2D2D5A77,0x0F0F1E11,0xB0B07BCB,0x5454A8FC,0xBBBB6DD6,0x16162C3A
- },
- {
- 0x63C6A563,0x7CF8847C,0x77EE9977,0x7BF68D7B,0xF2FF0DF2,0x6BD6BD6B,0x6FDEB16F,0xC59154C5,
- 0x30605030,0x01020301,0x67CEA967,0x2B567D2B,0xFEE719FE,0xD7B562D7,0xAB4DE6AB,0x76EC9A76,
- 0xCA8F45CA,0x821F9D82,0xC98940C9,0x7DFA877D,0xFAEF15FA,0x59B2EB59,0x478EC947,0xF0FB0BF0,
- 0xAD41ECAD,0xD4B367D4,0xA25FFDA2,0xAF45EAAF,0x9C23BF9C,0xA453F7A4,0x72E49672,0xC09B5BC0,
- 0xB775C2B7,0xFDE11CFD,0x933DAE93,0x264C6A26,0x366C5A36,0x3F7E413F,0xF7F502F7,0xCC834FCC,
- 0x34685C34,0xA551F4A5,0xE5D134E5,0xF1F908F1,0x71E29371,0xD8AB73D8,0x31625331,0x152A3F15,
- 0x04080C04,0xC79552C7,0x23466523,0xC39D5EC3,0x18302818,0x9637A196,0x050A0F05,0x9A2FB59A,
- 0x070E0907,0x12243612,0x801B9B80,0xE2DF3DE2,0xEBCD26EB,0x274E6927,0xB27FCDB2,0x75EA9F75,
- 0x09121B09,0x831D9E83,0x2C58742C,0x1A342E1A,0x1B362D1B,0x6EDCB26E,0x5AB4EE5A,0xA05BFBA0,
- 0x52A4F652,0x3B764D3B,0xD6B761D6,0xB37DCEB3,0x29527B29,0xE3DD3EE3,0x2F5E712F,0x84139784,
- 0x53A6F553,0xD1B968D1,0000000000,0xEDC12CED,0x20406020,0xFCE31FFC,0xB179C8B1,0x5BB6ED5B,
- 0x6AD4BE6A,0xCB8D46CB,0xBE67D9BE,0x39724B39,0x4A94DE4A,0x4C98D44C,0x58B0E858,0xCF854ACF,
- 0xD0BB6BD0,0xEFC52AEF,0xAA4FE5AA,0xFBED16FB,0x4386C543,0x4D9AD74D,0x33665533,0x85119485,
- 0x458ACF45,0xF9E910F9,0x02040602,0x7FFE817F,0x50A0F050,0x3C78443C,0x9F25BA9F,0xA84BE3A8,
- 0x51A2F351,0xA35DFEA3,0x4080C040,0x8F058A8F,0x923FAD92,0x9D21BC9D,0x38704838,0xF5F104F5,
- 0xBC63DFBC,0xB677C1B6,0xDAAF75DA,0x21426321,0x10203010,0xFFE51AFF,0xF3FD0EF3,0xD2BF6DD2,
- 0xCD814CCD,0x0C18140C,0x13263513,0xECC32FEC,0x5FBEE15F,0x9735A297,0x4488CC44,0x172E3917,
- 0xC49357C4,0xA755F2A7,0x7EFC827E,0x3D7A473D,0x64C8AC64,0x5DBAE75D,0x19322B19,0x73E69573,
- 0x60C0A060,0x81199881,0x4F9ED14F,0xDCA37FDC,0x22446622,0x2A547E2A,0x903BAB90,0x880B8388,
- 0x468CCA46,0xEEC729EE,0xB86BD3B8,0x14283C14,0xDEA779DE,0x5EBCE25E,0x0B161D0B,0xDBAD76DB,
- 0xE0DB3BE0,0x32645632,0x3A744E3A,0x0A141E0A,0x4992DB49,0x060C0A06,0x24486C24,0x5CB8E45C,
- 0xC29F5DC2,0xD3BD6ED3,0xAC43EFAC,0x62C4A662,0x9139A891,0x9531A495,0xE4D337E4,0x79F28B79,
- 0xE7D532E7,0xC88B43C8,0x376E5937,0x6DDAB76D,0x8D018C8D,0xD5B164D5,0x4E9CD24E,0xA949E0A9,
- 0x6CD8B46C,0x56ACFA56,0xF4F307F4,0xEACF25EA,0x65CAAF65,0x7AF48E7A,0xAE47E9AE,0x08101808,
- 0xBA6FD5BA,0x78F08878,0x254A6F25,0x2E5C722E,0x1C38241C,0xA657F1A6,0xB473C7B4,0xC69751C6,
- 0xE8CB23E8,0xDDA17CDD,0x74E89C74,0x1F3E211F,0x4B96DD4B,0xBD61DCBD,0x8B0D868B,0x8A0F858A,
- 0x70E09070,0x3E7C423E,0xB571C4B5,0x66CCAA66,0x4890D848,0x03060503,0xF6F701F6,0x0E1C120E,
- 0x61C2A361,0x356A5F35,0x57AEF957,0xB969D0B9,0x86179186,0xC19958C1,0x1D3A271D,0x9E27B99E,
- 0xE1D938E1,0xF8EB13F8,0x982BB398,0x11223311,0x69D2BB69,0xD9A970D9,0x8E07898E,0x9433A794,
- 0x9B2DB69B,0x1E3C221E,0x87159287,0xE9C920E9,0xCE8749CE,0x55AAFF55,0x28507828,0xDFA57ADF,
- 0x8C038F8C,0xA159F8A1,0x89098089,0x0D1A170D,0xBF65DABF,0xE6D731E6,0x4284C642,0x68D0B868,
- 0x4182C341,0x9929B099,0x2D5A772D,0x0F1E110F,0xB07BCBB0,0x54A8FC54,0xBB6DD6BB,0x162C3A16
- },
- {
- 0xC6A56363,0xF8847C7C,0xEE997777,0xF68D7B7B,0xFF0DF2F2,0xD6BD6B6B,0xDEB16F6F,0x9154C5C5,
- 0x60503030,0x02030101,0xCEA96767,0x567D2B2B,0xE719FEFE,0xB562D7D7,0x4DE6ABAB,0xEC9A7676,
- 0x8F45CACA,0x1F9D8282,0x8940C9C9,0xFA877D7D,0xEF15FAFA,0xB2EB5959,0x8EC94747,0xFB0BF0F0,
- 0x41ECADAD,0xB367D4D4,0x5FFDA2A2,0x45EAAFAF,0x23BF9C9C,0x53F7A4A4,0xE4967272,0x9B5BC0C0,
- 0x75C2B7B7,0xE11CFDFD,0x3DAE9393,0x4C6A2626,0x6C5A3636,0x7E413F3F,0xF502F7F7,0x834FCCCC,
- 0x685C3434,0x51F4A5A5,0xD134E5E5,0xF908F1F1,0xE2937171,0xAB73D8D8,0x62533131,0x2A3F1515,
- 0x080C0404,0x9552C7C7,0x46652323,0x9D5EC3C3,0x30281818,0x37A19696,0x0A0F0505,0x2FB59A9A,
- 0x0E090707,0x24361212,0x1B9B8080,0xDF3DE2E2,0xCD26EBEB,0x4E692727,0x7FCDB2B2,0xEA9F7575,
- 0x121B0909,0x1D9E8383,0x58742C2C,0x342E1A1A,0x362D1B1B,0xDCB26E6E,0xB4EE5A5A,0x5BFBA0A0,
- 0xA4F65252,0x764D3B3B,0xB761D6D6,0x7DCEB3B3,0x527B2929,0xDD3EE3E3,0x5E712F2F,0x13978484,
- 0xA6F55353,0xB968D1D1,0000000000,0xC12CEDED,0x40602020,0xE31FFCFC,0x79C8B1B1,0xB6ED5B5B,
- 0xD4BE6A6A,0x8D46CBCB,0x67D9BEBE,0x724B3939,0x94DE4A4A,0x98D44C4C,0xB0E85858,0x854ACFCF,
- 0xBB6BD0D0,0xC52AEFEF,0x4FE5AAAA,0xED16FBFB,0x86C54343,0x9AD74D4D,0x66553333,0x11948585,
- 0x8ACF4545,0xE910F9F9,0x04060202,0xFE817F7F,0xA0F05050,0x78443C3C,0x25BA9F9F,0x4BE3A8A8,
- 0xA2F35151,0x5DFEA3A3,0x80C04040,0x058A8F8F,0x3FAD9292,0x21BC9D9D,0x70483838,0xF104F5F5,
- 0x63DFBCBC,0x77C1B6B6,0xAF75DADA,0x42632121,0x20301010,0xE51AFFFF,0xFD0EF3F3,0xBF6DD2D2,
- 0x814CCDCD,0x18140C0C,0x26351313,0xC32FECEC,0xBEE15F5F,0x35A29797,0x88CC4444,0x2E391717,
- 0x9357C4C4,0x55F2A7A7,0xFC827E7E,0x7A473D3D,0xC8AC6464,0xBAE75D5D,0x322B1919,0xE6957373,
- 0xC0A06060,0x19988181,0x9ED14F4F,0xA37FDCDC,0x44662222,0x547E2A2A,0x3BAB9090,0x0B838888,
- 0x8CCA4646,0xC729EEEE,0x6BD3B8B8,0x283C1414,0xA779DEDE,0xBCE25E5E,0x161D0B0B,0xAD76DBDB,
- 0xDB3BE0E0,0x64563232,0x744E3A3A,0x141E0A0A,0x92DB4949,0x0C0A0606,0x486C2424,0xB8E45C5C,
- 0x9F5DC2C2,0xBD6ED3D3,0x43EFACAC,0xC4A66262,0x39A89191,0x31A49595,0xD337E4E4,0xF28B7979,
- 0xD532E7E7,0x8B43C8C8,0x6E593737,0xDAB76D6D,0x018C8D8D,0xB164D5D5,0x9CD24E4E,0x49E0A9A9,
- 0xD8B46C6C,0xACFA5656,0xF307F4F4,0xCF25EAEA,0xCAAF6565,0xF48E7A7A,0x47E9AEAE,0x10180808,
- 0x6FD5BABA,0xF0887878,0x4A6F2525,0x5C722E2E,0x38241C1C,0x57F1A6A6,0x73C7B4B4,0x9751C6C6,
- 0xCB23E8E8,0xA17CDDDD,0xE89C7474,0x3E211F1F,0x96DD4B4B,0x61DCBDBD,0x0D868B8B,0x0F858A8A,
- 0xE0907070,0x7C423E3E,0x71C4B5B5,0xCCAA6666,0x90D84848,0x06050303,0xF701F6F6,0x1C120E0E,
- 0xC2A36161,0x6A5F3535,0xAEF95757,0x69D0B9B9,0x17918686,0x9958C1C1,0x3A271D1D,0x27B99E9E,
- 0xD938E1E1,0xEB13F8F8,0x2BB39898,0x22331111,0xD2BB6969,0xA970D9D9,0x07898E8E,0x33A79494,
- 0x2DB69B9B,0x3C221E1E,0x15928787,0xC920E9E9,0x8749CECE,0xAAFF5555,0x50782828,0xA57ADFDF,
- 0x038F8C8C,0x59F8A1A1,0x09808989,0x1A170D0D,0x65DABFBF,0xD731E6E6,0x84C64242,0xD0B86868,
- 0x82C34141,0x29B09999,0x5A772D2D,0x1E110F0F,0x7BCBB0B0,0xA8FC5454,0x6DD6BBBB,0x2C3A1616
- }
-};
-
-static u32 fl_tab[4][256] =
-{
- {
- 0x00000063,0x0000007C,0x00000077,0x0000007B,0x000000F2,0x0000006B,0x0000006F,0x000000C5,
- 0x00000030,0x00000001,0x00000067,0x0000002B,0x000000FE,0x000000D7,0x000000AB,0x00000076,
- 0x000000CA,0x00000082,0x000000C9,0x0000007D,0x000000FA,0x00000059,0x00000047,0x000000F0,
- 0x000000AD,0x000000D4,0x000000A2,0x000000AF,0x0000009C,0x000000A4,0x00000072,0x000000C0,
- 0x000000B7,0x000000FD,0x00000093,0x00000026,0x00000036,0x0000003F,0x000000F7,0x000000CC,
- 0x00000034,0x000000A5,0x000000E5,0x000000F1,0x00000071,0x000000D8,0x00000031,0x00000015,
- 0x00000004,0x000000C7,0x00000023,0x000000C3,0x00000018,0x00000096,0x00000005,0x0000009A,
- 0x00000007,0x00000012,0x00000080,0x000000E2,0x000000EB,0x00000027,0x000000B2,0x00000075,
- 0x00000009,0x00000083,0x0000002C,0x0000001A,0x0000001B,0x0000006E,0x0000005A,0x000000A0,
- 0x00000052,0x0000003B,0x000000D6,0x000000B3,0x00000029,0x000000E3,0x0000002F,0x00000084,
- 0x00000053,0x000000D1,0x00000000,0x000000ED,0x00000020,0x000000FC,0x000000B1,0x0000005B,
- 0x0000006A,0x000000CB,0x000000BE,0x00000039,0x0000004A,0x0000004C,0x00000058,0x000000CF,
- 0x000000D0,0x000000EF,0x000000AA,0x000000FB,0x00000043,0x0000004D,0x00000033,0x00000085,
- 0x00000045,0x000000F9,0x00000002,0x0000007F,0x00000050,0x0000003C,0x0000009F,0x000000A8,
- 0x00000051,0x000000A3,0x00000040,0x0000008F,0x00000092,0x0000009D,0x00000038,0x000000F5,
- 0x000000BC,0x000000B6,0x000000DA,0x00000021,0x00000010,0x000000FF,0x000000F3,0x000000D2,
- 0x000000CD,0x0000000C,0x00000013,0x000000EC,0x0000005F,0x00000097,0x00000044,0x00000017,
- 0x000000C4,0x000000A7,0x0000007E,0x0000003D,0x00000064,0x0000005D,0x00000019,0x00000073,
- 0x00000060,0x00000081,0x0000004F,0x000000DC,0x00000022,0x0000002A,0x00000090,0x00000088,
- 0x00000046,0x000000EE,0x000000B8,0x00000014,0x000000DE,0x0000005E,0x0000000B,0x000000DB,
- 0x000000E0,0x00000032,0x0000003A,0x0000000A,0x00000049,0x00000006,0x00000024,0x0000005C,
- 0x000000C2,0x000000D3,0x000000AC,0x00000062,0x00000091,0x00000095,0x000000E4,0x00000079,
- 0x000000E7,0x000000C8,0x00000037,0x0000006D,0x0000008D,0x000000D5,0x0000004E,0x000000A9,
- 0x0000006C,0x00000056,0x000000F4,0x000000EA,0x00000065,0x0000007A,0x000000AE,0x00000008,
- 0x000000BA,0x00000078,0x00000025,0x0000002E,0x0000001C,0x000000A6,0x000000B4,0x000000C6,
- 0x000000E8,0x000000DD,0x00000074,0x0000001F,0x0000004B,0x000000BD,0x0000008B,0x0000008A,
- 0x00000070,0x0000003E,0x000000B5,0x00000066,0x00000048,0x00000003,0x000000F6,0x0000000E,
- 0x00000061,0x00000035,0x00000057,0x000000B9,0x00000086,0x000000C1,0x0000001D,0x0000009E,
- 0x000000E1,0x000000F8,0x00000098,0x00000011,0x00000069,0x000000D9,0x0000008E,0x00000094,
- 0x0000009B,0x0000001E,0x00000087,0x000000E9,0x000000CE,0x00000055,0x00000028,0x000000DF,
- 0x0000008C,0x000000A1,0x00000089,0x0000000D,0x000000BF,0x000000E6,0x00000042,0x00000068,
- 0x00000041,0x00000099,0x0000002D,0x0000000F,0x000000B0,0x00000054,0x000000BB,0x00000016
- },
- {
- 0x00006300,0x00007C00,0x00007700,0x00007B00,0x0000F200,0x00006B00,0x00006F00,0x0000C500,
- 0x00003000,0x00000100,0x00006700,0x00002B00,0x0000FE00,0x0000D700,0x0000AB00,0x00007600,
- 0x0000CA00,0x00008200,0x0000C900,0x00007D00,0x0000FA00,0x00005900,0x00004700,0x0000F000,
- 0x0000AD00,0x0000D400,0x0000A200,0x0000AF00,0x00009C00,0x0000A400,0x00007200,0x0000C000,
- 0x0000B700,0x0000FD00,0x00009300,0x00002600,0x00003600,0x00003F00,0x0000F700,0x0000CC00,
- 0x00003400,0x0000A500,0x0000E500,0x0000F100,0x00007100,0x0000D800,0x00003100,0x00001500,
- 0x00000400,0x0000C700,0x00002300,0x0000C300,0x00001800,0x00009600,0x00000500,0x00009A00,
- 0x00000700,0x00001200,0x00008000,0x0000E200,0x0000EB00,0x00002700,0x0000B200,0x00007500,
- 0x00000900,0x00008300,0x00002C00,0x00001A00,0x00001B00,0x00006E00,0x00005A00,0x0000A000,
- 0x00005200,0x00003B00,0x0000D600,0x0000B300,0x00002900,0x0000E300,0x00002F00,0x00008400,
- 0x00005300,0x0000D100,0000000000,0x0000ED00,0x00002000,0x0000FC00,0x0000B100,0x00005B00,
- 0x00006A00,0x0000CB00,0x0000BE00,0x00003900,0x00004A00,0x00004C00,0x00005800,0x0000CF00,
- 0x0000D000,0x0000EF00,0x0000AA00,0x0000FB00,0x00004300,0x00004D00,0x00003300,0x00008500,
- 0x00004500,0x0000F900,0x00000200,0x00007F00,0x00005000,0x00003C00,0x00009F00,0x0000A800,
- 0x00005100,0x0000A300,0x00004000,0x00008F00,0x00009200,0x00009D00,0x00003800,0x0000F500,
- 0x0000BC00,0x0000B600,0x0000DA00,0x00002100,0x00001000,0x0000FF00,0x0000F300,0x0000D200,
- 0x0000CD00,0x00000C00,0x00001300,0x0000EC00,0x00005F00,0x00009700,0x00004400,0x00001700,
- 0x0000C400,0x0000A700,0x00007E00,0x00003D00,0x00006400,0x00005D00,0x00001900,0x00007300,
- 0x00006000,0x00008100,0x00004F00,0x0000DC00,0x00002200,0x00002A00,0x00009000,0x00008800,
- 0x00004600,0x0000EE00,0x0000B800,0x00001400,0x0000DE00,0x00005E00,0x00000B00,0x0000DB00,
- 0x0000E000,0x00003200,0x00003A00,0x00000A00,0x00004900,0x00000600,0x00002400,0x00005C00,
- 0x0000C200,0x0000D300,0x0000AC00,0x00006200,0x00009100,0x00009500,0x0000E400,0x00007900,
- 0x0000E700,0x0000C800,0x00003700,0x00006D00,0x00008D00,0x0000D500,0x00004E00,0x0000A900,
- 0x00006C00,0x00005600,0x0000F400,0x0000EA00,0x00006500,0x00007A00,0x0000AE00,0x00000800,
- 0x0000BA00,0x00007800,0x00002500,0x00002E00,0x00001C00,0x0000A600,0x0000B400,0x0000C600,
- 0x0000E800,0x0000DD00,0x00007400,0x00001F00,0x00004B00,0x0000BD00,0x00008B00,0x00008A00,
- 0x00007000,0x00003E00,0x0000B500,0x00006600,0x00004800,0x00000300,0x0000F600,0x00000E00,
- 0x00006100,0x00003500,0x00005700,0x0000B900,0x00008600,0x0000C100,0x00001D00,0x00009E00,
- 0x0000E100,0x0000F800,0x00009800,0x00001100,0x00006900,0x0000D900,0x00008E00,0x00009400,
- 0x00009B00,0x00001E00,0x00008700,0x0000E900,0x0000CE00,0x00005500,0x00002800,0x0000DF00,
- 0x00008C00,0x0000A100,0x00008900,0x00000D00,0x0000BF00,0x0000E600,0x00004200,0x00006800,
- 0x00004100,0x00009900,0x00002D00,0x00000F00,0x0000B000,0x00005400,0x0000BB00,0x00001600
- },
- {
- 0x00630000,0x007C0000,0x00770000,0x007B0000,0x00F20000,0x006B0000,0x006F0000,0x00C50000,
- 0x00300000,0x00010000,0x00670000,0x002B0000,0x00FE0000,0x00D70000,0x00AB0000,0x00760000,
- 0x00CA0000,0x00820000,0x00C90000,0x007D0000,0x00FA0000,0x00590000,0x00470000,0x00F00000,
- 0x00AD0000,0x00D40000,0x00A20000,0x00AF0000,0x009C0000,0x00A40000,0x00720000,0x00C00000,
- 0x00B70000,0x00FD0000,0x00930000,0x00260000,0x00360000,0x003F0000,0x00F70000,0x00CC0000,
- 0x00340000,0x00A50000,0x00E50000,0x00F10000,0x00710000,0x00D80000,0x00310000,0x00150000,
- 0x00040000,0x00C70000,0x00230000,0x00C30000,0x00180000,0x00960000,0x00050000,0x009A0000,
- 0x00070000,0x00120000,0x00800000,0x00E20000,0x00EB0000,0x00270000,0x00B20000,0x00750000,
- 0x00090000,0x00830000,0x002C0000,0x001A0000,0x001B0000,0x006E0000,0x005A0000,0x00A00000,
- 0x00520000,0x003B0000,0x00D60000,0x00B30000,0x00290000,0x00E30000,0x002F0000,0x00840000,
- 0x00530000,0x00D10000,0000000000,0x00ED0000,0x00200000,0x00FC0000,0x00B10000,0x005B0000,
- 0x006A0000,0x00CB0000,0x00BE0000,0x00390000,0x004A0000,0x004C0000,0x00580000,0x00CF0000,
- 0x00D00000,0x00EF0000,0x00AA0000,0x00FB0000,0x00430000,0x004D0000,0x00330000,0x00850000,
- 0x00450000,0x00F90000,0x00020000,0x007F0000,0x00500000,0x003C0000,0x009F0000,0x00A80000,
- 0x00510000,0x00A30000,0x00400000,0x008F0000,0x00920000,0x009D0000,0x00380000,0x00F50000,
- 0x00BC0000,0x00B60000,0x00DA0000,0x00210000,0x00100000,0x00FF0000,0x00F30000,0x00D20000,
- 0x00CD0000,0x000C0000,0x00130000,0x00EC0000,0x005F0000,0x00970000,0x00440000,0x00170000,
- 0x00C40000,0x00A70000,0x007E0000,0x003D0000,0x00640000,0x005D0000,0x00190000,0x00730000,
- 0x00600000,0x00810000,0x004F0000,0x00DC0000,0x00220000,0x002A0000,0x00900000,0x00880000,
- 0x00460000,0x00EE0000,0x00B80000,0x00140000,0x00DE0000,0x005E0000,0x000B0000,0x00DB0000,
- 0x00E00000,0x00320000,0x003A0000,0x000A0000,0x00490000,0x00060000,0x00240000,0x005C0000,
- 0x00C20000,0x00D30000,0x00AC0000,0x00620000,0x00910000,0x00950000,0x00E40000,0x00790000,
- 0x00E70000,0x00C80000,0x00370000,0x006D0000,0x008D0000,0x00D50000,0x004E0000,0x00A90000,
- 0x006C0000,0x00560000,0x00F40000,0x00EA0000,0x00650000,0x007A0000,0x00AE0000,0x00080000,
- 0x00BA0000,0x00780000,0x00250000,0x002E0000,0x001C0000,0x00A60000,0x00B40000,0x00C60000,
- 0x00E80000,0x00DD0000,0x00740000,0x001F0000,0x004B0000,0x00BD0000,0x008B0000,0x008A0000,
- 0x00700000,0x003E0000,0x00B50000,0x00660000,0x00480000,0x00030000,0x00F60000,0x000E0000,
- 0x00610000,0x00350000,0x00570000,0x00B90000,0x00860000,0x00C10000,0x001D0000,0x009E0000,
- 0x00E10000,0x00F80000,0x00980000,0x00110000,0x00690000,0x00D90000,0x008E0000,0x00940000,
- 0x009B0000,0x001E0000,0x00870000,0x00E90000,0x00CE0000,0x00550000,0x00280000,0x00DF0000,
- 0x008C0000,0x00A10000,0x00890000,0x000D0000,0x00BF0000,0x00E60000,0x00420000,0x00680000,
- 0x00410000,0x00990000,0x002D0000,0x000F0000,0x00B00000,0x00540000,0x00BB0000,0x00160000
- },
- {
- 0x63000000,0x7C000000,0x77000000,0x7B000000,0xF2000000,0x6B000000,0x6F000000,0xC5000000,
- 0x30000000,0x01000000,0x67000000,0x2B000000,0xFE000000,0xD7000000,0xAB000000,0x76000000,
- 0xCA000000,0x82000000,0xC9000000,0x7D000000,0xFA000000,0x59000000,0x47000000,0xF0000000,
- 0xAD000000,0xD4000000,0xA2000000,0xAF000000,0x9C000000,0xA4000000,0x72000000,0xC0000000,
- 0xB7000000,0xFD000000,0x93000000,0x26000000,0x36000000,0x3F000000,0xF7000000,0xCC000000,
- 0x34000000,0xA5000000,0xE5000000,0xF1000000,0x71000000,0xD8000000,0x31000000,0x15000000,
- 0x04000000,0xC7000000,0x23000000,0xC3000000,0x18000000,0x96000000,0x05000000,0x9A000000,
- 0x07000000,0x12000000,0x80000000,0xE2000000,0xEB000000,0x27000000,0xB2000000,0x75000000,
- 0x09000000,0x83000000,0x2C000000,0x1A000000,0x1B000000,0x6E000000,0x5A000000,0xA0000000,
- 0x52000000,0x3B000000,0xD6000000,0xB3000000,0x29000000,0xE3000000,0x2F000000,0x84000000,
- 0x53000000,0xD1000000,0000000000,0xED000000,0x20000000,0xFC000000,0xB1000000,0x5B000000,
- 0x6A000000,0xCB000000,0xBE000000,0x39000000,0x4A000000,0x4C000000,0x58000000,0xCF000000,
- 0xD0000000,0xEF000000,0xAA000000,0xFB000000,0x43000000,0x4D000000,0x33000000,0x85000000,
- 0x45000000,0xF9000000,0x02000000,0x7F000000,0x50000000,0x3C000000,0x9F000000,0xA8000000,
- 0x51000000,0xA3000000,0x40000000,0x8F000000,0x92000000,0x9D000000,0x38000000,0xF5000000,
- 0xBC000000,0xB6000000,0xDA000000,0x21000000,0x10000000,0xFF000000,0xF3000000,0xD2000000,
- 0xCD000000,0x0C000000,0x13000000,0xEC000000,0x5F000000,0x97000000,0x44000000,0x17000000,
- 0xC4000000,0xA7000000,0x7E000000,0x3D000000,0x64000000,0x5D000000,0x19000000,0x73000000,
- 0x60000000,0x81000000,0x4F000000,0xDC000000,0x22000000,0x2A000000,0x90000000,0x88000000,
- 0x46000000,0xEE000000,0xB8000000,0x14000000,0xDE000000,0x5E000000,0x0B000000,0xDB000000,
- 0xE0000000,0x32000000,0x3A000000,0x0A000000,0x49000000,0x06000000,0x24000000,0x5C000000,
- 0xC2000000,0xD3000000,0xAC000000,0x62000000,0x91000000,0x95000000,0xE4000000,0x79000000,
- 0xE7000000,0xC8000000,0x37000000,0x6D000000,0x8D000000,0xD5000000,0x4E000000,0xA9000000,
- 0x6C000000,0x56000000,0xF4000000,0xEA000000,0x65000000,0x7A000000,0xAE000000,0x08000000,
- 0xBA000000,0x78000000,0x25000000,0x2E000000,0x1C000000,0xA6000000,0xB4000000,0xC6000000,
- 0xE8000000,0xDD000000,0x74000000,0x1F000000,0x4B000000,0xBD000000,0x8B000000,0x8A000000,
- 0x70000000,0x3E000000,0xB5000000,0x66000000,0x48000000,0x03000000,0xF6000000,0x0E000000,
- 0x61000000,0x35000000,0x57000000,0xB9000000,0x86000000,0xC1000000,0x1D000000,0x9E000000,
- 0xE1000000,0xF8000000,0x98000000,0x11000000,0x69000000,0xD9000000,0x8E000000,0x94000000,
- 0x9B000000,0x1E000000,0x87000000,0xE9000000,0xCE000000,0x55000000,0x28000000,0xDF000000,
- 0x8C000000,0xA1000000,0x89000000,0x0D000000,0xBF000000,0xE6000000,0x42000000,0x68000000,
- 0x41000000,0x99000000,0x2D000000,0x0F000000,0xB0000000,0x54000000,0xBB000000,0x16000000
- }
-};
-
-/*----------------- The workspace ------------------------------*/
-
-static u32 Ekey[44]; /* The expanded key */
-
-/*------ The round Function. 4 table lookups and 4 Exors ------*/
-#define f_rnd(x, n) \
- ( ft_tab[0][byte0(x[n])] \
- ^ ft_tab[1][byte1(x[(n + 1) & 3])] \
- ^ ft_tab[2][byte2(x[(n + 2) & 3])] \
- ^ ft_tab[3][byte3(x[(n + 3) & 3])] )
-
-#define f_round(bo, bi, k) \
- bo[0] = f_rnd(bi, 0) ^ k[0]; \
- bo[1] = f_rnd(bi, 1) ^ k[1]; \
- bo[2] = f_rnd(bi, 2) ^ k[2]; \
- bo[3] = f_rnd(bi, 3) ^ k[3]; \
- k += 4
-
-/*--- The S Box lookup used in constructing the Key schedule ---*/
-#define ls_box(x) \
- ( fl_tab[0][byte0(x)] \
- ^ fl_tab[1][byte1(x)] \
- ^ fl_tab[2][byte2(x)] \
- ^ fl_tab[3][byte3(x)] )
-
-/*------------ The last round function (no MixColumn) ----------*/
-#define lf_rnd(x, n) \
- ( fl_tab[0][byte0(x[n])] \
- ^ fl_tab[1][byte1(x[(n + 1) & 3])] \
- ^ fl_tab[2][byte2(x[(n + 2) & 3])] \
- ^ fl_tab[3][byte3(x[(n + 3) & 3])] )
-
-
-/*-----------------------------------------------------------
- * RijndaelKeySchedule
- * Initialise the key schedule from a supplied key
- */
-void RijndaelKeySchedule(u8 key[16])
-{
- u32 t;
- u32 *ek=Ekey, /* pointer to the expanded key */
- *rc=rnd_con; /* pointer to the round constant */
-
- Ekey[0] = u32_in(key );
- Ekey[1] = u32_in(key + 4);
- Ekey[2] = u32_in(key + 8);
- Ekey[3] = u32_in(key + 12);
-
- while(ek < Ekey + 40)
- {
- t = rot3(ek[3]);
- ek[4] = ek[0] ^ ls_box(t) ^ *rc++;
- ek[5] = ek[1] ^ ek[4];
- ek[6] = ek[2] ^ ek[5];
- ek[7] = ek[3] ^ ek[6];
- ek += 4;
- }
-}
-
-/*-----------------------------------------------------------
- * RijndaelEncrypt
- * Encrypt an input block
- */
-void RijndaelEncrypt(u8 in[16], u8 out[16])
-{
- u32 b0[4], b1[4], *kp = Ekey;
-
- b0[0] = u32_in(in ) ^ *kp++;
- b0[1] = u32_in(in + 4) ^ *kp++;
- b0[2] = u32_in(in + 8) ^ *kp++;
- b0[3] = u32_in(in + 12) ^ *kp++;
-
- f_round(b1, b0, kp);
- f_round(b0, b1, kp);
- f_round(b1, b0, kp);
- f_round(b0, b1, kp);
- f_round(b1, b0, kp);
- f_round(b0, b1, kp);
- f_round(b1, b0, kp);
- f_round(b0, b1, kp);
- f_round(b1, b0, kp);
-
- u32_out(out, lf_rnd(b1, 0) ^ kp[0]);
- u32_out(out + 4, lf_rnd(b1, 1) ^ kp[1]);
- u32_out(out + 8, lf_rnd(b1, 2) ^ kp[2]);
- u32_out(out + 12, lf_rnd(b1, 3) ^ kp[3]);
-}
diff --git a/sflphone-common/libs/pjproject/third_party/milenage/rijndael.h b/sflphone-common/libs/pjproject/third_party/milenage/rijndael.h
deleted file mode 100644
index 4e728a5b3e7c77d4e492e2c90e551ffbccd15dd2..0000000000000000000000000000000000000000
--- a/sflphone-common/libs/pjproject/third_party/milenage/rijndael.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-------------------------------------------------------------------
- * Example algorithms f1, f1*, f2, f3, f4, f5, f5*
- *-------------------------------------------------------------------
- *
- * A sample implementation of the example 3GPP authentication and
- * key agreement functions f1, f1*, f2, f3, f4, f5 and f5*. This is
- * a byte-oriented implementation of the functions, and of the block
- * cipher kernel function Rijndael.
- *
- * This has been coded for clarity, not necessarily for efficiency.
- *
- * The functions f2, f3, f4 and f5 share the same inputs and have
- * been coded together as a single function. f1, f1* and f5* are
- * all coded separately.
- *
- *-----------------------------------------------------------------*/
-
-#ifndef RIJNDAEL_H
-#define RIJNDAEL_H
-
-
-void RijndaelKeySchedule( u8 key[16] );
-void RijndaelEncrypt( u8 input[16], u8 output[16] );
-
-
-#endif
diff --git a/sflphone-common/src/audio/alsa/alsalayer.cpp b/sflphone-common/src/audio/alsa/alsalayer.cpp
index 0fc73f67fb6bac02788d6681eb5f173ee182978a..ee8ccdaac8cbad640f7a11ae655167162c53c212 100644
--- a/sflphone-common/src/audio/alsa/alsalayer.cpp
+++ b/sflphone-common/src/audio/alsa/alsalayer.cpp
@@ -160,9 +160,11 @@ AlsaLayer::startStream (void)
startCaptureStream ();
startPlaybackStream ();
- _urgentRingBuffer.flush();
- getMainBuffer()->flushAllBuffers();
- getMainBuffer()->flushDefault();
+ flushMain();
+ flushUrgent();
+ // _urgentRingBuffer.flush();
+ // getMainBuffer()->flushAllBuffers();
+ // getMainBuffer()->flushDefault();
if(_audioThread == NULL) {
try {
diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp
index 9853fad03ef44bf17a42d53457edccc3d357178f..1e513c7744ab9ff0887890eae8937e2582b05ca1 100644
--- a/sflphone-common/src/audio/audiolayer.cpp
+++ b/sflphone-common/src/audio/audiolayer.cpp
@@ -23,8 +23,10 @@ void AudioLayer::flushMain (void)
{
ost::MutexLock guard (_mutex);
- // should pass call id
- getMainBuffer()->flushAllBuffers();
+ // should pass call id
+ MainBuffer* mainbuffer = getMainBuffer();
+ if(mainbuffer)
+ mainbuffer->flushAllBuffers();
}
@@ -37,6 +39,7 @@ void AudioLayer::flushUrgent (void)
int AudioLayer::putUrgent (void* buffer, int toCopy)
{
+ _debug("------------------- AudioLayer::putUrgent --------------------\n");
int a;
ost::MutexLock guard (_mutex);
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index 3ac8916b3aa4dbb20093b47d40500406647156ec..870926c0ae2569c70ccca6f851b6c47a4faa40cd 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -336,12 +336,17 @@ namespace sfl {
// test if resampling is required
if (_audiocodec->getClockRate() != _mainBufferSampleRate) {
int nb_sample_up = nbSample;
+
_nSamplesMic = nbSample;
+
nbSample = _converter->downsampleData (_micData , _micDataConverted , _audiocodec->getClockRate(), _mainBufferSampleRate, nb_sample_up);
compSize = _audiocodec->codecEncode (_micDataEncoded, _micDataConverted, nbSample*sizeof (int16));
} else {
+
+ _nSamplesMic = nbSample;
+
// no resampling required
compSize = _audiocodec->codecEncode (_micDataEncoded, _micData, nbSample*sizeof (int16));
}
@@ -392,11 +397,14 @@ namespace sfl {
countTime += _time->getSecond();
if (_manager->incomingCallWaiting() > 0) {
- countTime = countTime % 500; // more often...
-
- if (countTime == 0) {
+ int countTime_modulo = countTime % 4000;
+ // _debug("countTime: %i\n", countTime);
+ // _debug("countTime_modulo: %i\n", countTime_modulo);
+ if ((countTime_modulo - countTime) < 0) {
_manager->notificationIncomingCall();
}
+
+ countTime = countTime_modulo;
}
} else {
@@ -499,10 +507,13 @@ namespace sfl {
_ca->setRecordingSmplRate(_audiocodec->getClockRate());
+ // Start audio stream (if not started) AND flush all buffers (main and urgent)
_audiolayer->startStream();
static_cast<D*>(this)->startRunning();
- _audiolayer->flushUrgent();
+ // Already called in _audiolayer->startStream()
+ // _audiolayer->flushUrgent();
+ // _audiolayer->flushMain();
_debug ("Entering RTP mainloop for callid %s\n",_ca->getCallId().c_str());
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index 485698bdba23f4d482cf24e58f8b5b988daad929..d4745be5f1017158ec70834a934eec5746de10d9 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -435,7 +435,7 @@ int MainBuffer::availForGet(CallID call_id)
// _debug("MainBuffer::availForGet availForGetByID(%s,%s)\n", (*iter_id).c_str(), call_id.c_str());
if((call_id != default_id) && (*iter_id == call_id))
{
- _debug("This problem should not occur since we have %i element\n", callid_set->size());
+ _debug("This problem should not occur since we have %i element\n", (int)callid_set->size());
}
// else
return availForGetByID(*iter_id, call_id);
@@ -586,10 +586,15 @@ void MainBuffer::flushByID(CallID call_id, CallID reader_id)
void MainBuffer::flushAllBuffers()
{
+
+ // _debug("-------------------------- flushAllBuffers()\n");
+
RingBufferMap::iterator iter_buffer = _ringBufferMap.begin();
while(iter_buffer != _ringBufferMap.end())
{
+ // _debug("-------------------------- flushing: %s\n",iter_buffer->second->getBufferId().c_str());
+
iter_buffer->second->flushAll();
iter_buffer++;
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
index ec62751477090569f47e8b759264e8ccd4ca6d7f..2a7c11fdc83e5f36a58ea6b658fd4941f3b88e33 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
@@ -173,8 +173,6 @@ PulseLayer::connectPulseAudioServer (void)
pa_threaded_mainloop_unlock (m);
- _urgentRingBuffer.flushAll();
-
//serverinfo();
//muteAudioApps(99);
_debug ("Context creation done\n");
@@ -267,7 +265,9 @@ bool PulseLayer::createStreams (pa_context* c)
pa_threaded_mainloop_signal (m , 0);
- _urgentRingBuffer.flushAll();
+ flushMain();
+ flushUrgent();
+ // _urgentRingBuffer.flushAll();
return true;
@@ -279,7 +279,8 @@ bool PulseLayer::openDevice (int indexIn UNUSED, int indexOut UNUSED, int sample
_audioSampleRate = sampleRate;
_frameSize = frameSize;
- _urgentRingBuffer.flushAll();
+ // _urgentRingBuffer.flushAll();
+ flushUrgent();
_converter = new SamplerateConverter (_audioSampleRate, _frameSize*4);
@@ -361,8 +362,10 @@ void PulseLayer::startStream (void)
is_started = true;
}
- _urgentRingBuffer.flushAll();
- getMainBuffer()->flushAllBuffers();
+ // Flush outside the if statement: every time start stream is
+ // called is to notify a new event
+ flushUrgent();
+ flushMain();
}
@@ -487,6 +490,7 @@ void PulseLayer::writeToSpeaker (void)
SFLDataFormat* out;// = (SFLDataFormat*)pa_xmalloc(framesPerBuffer);
urgentAvailBytes = _urgentRingBuffer.AvailForGet();
+
int writeableSize = pa_stream_writable_size(playback->pulseStream());
// _debug("PulseLayer writablesize : %i\n", writeableSize);
@@ -499,6 +503,8 @@ void PulseLayer::writeToSpeaker (void)
// _debug("urgentAvailBytes: %i\n", urgentAvailBytes);
+ // _debug("Play Urgent!\n");
+
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
_urgentRingBuffer.Get (out, writeableSize, 100);
// pa_threaded_mainloop_lock (m);
@@ -517,7 +523,7 @@ void PulseLayer::writeToSpeaker (void)
AudioLoop* file_tone = _manager->getTelephoneFile();
// flush remaining samples in _urgentRingBuffer
- _urgentRingBuffer.flushAll();
+ flushUrgent();
if (tone != 0) {
@@ -526,6 +532,8 @@ void PulseLayer::writeToSpeaker (void)
if (playback->getStreamState() == PA_STREAM_READY)
{
+ // _debug("Play Sine Tone!\n");
+
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
int copied = tone->getNext (out, writeableSize / sizeof (SFLDataFormat), 100);
// pa_threaded_mainloop_lock (m);
@@ -541,6 +549,7 @@ void PulseLayer::writeToSpeaker (void)
if (playback->getStreamState() == PA_STREAM_READY)
{
+ // _debug("Play File Tone!\n");
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
int copied = file_tone->getNext(out, writeableSize / sizeof(SFLDataFormat), 100);
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/sflphone-common/src/audio/ringbuffer.cpp
index a25eb0e0a62e12c299de7e73f7a67406566a6204..f8420187e8cba33490687b192f8d37924c60fd47 100644
--- a/sflphone-common/src/audio/ringbuffer.cpp
+++ b/sflphone-common/src/audio/ringbuffer.cpp
@@ -64,9 +64,12 @@ RingBuffer::flushAll ()
{
// _debug("flushall: reinit all readpointer in \"%s\" ringbuffer\n", buffer_id.c_str());
+ // _debug("------------------------------ flushAll() in \"%s\" ringbuffer\n", buffer_id.c_str());
+
ReadPointer::iterator iter_pointer = _readpointer.begin();
while(iter_pointer != _readpointer.end())
{
+ // _debug("------------------------------ reinit readpointer %s\n", iter_pointer->first.c_str());
iter_pointer->second = mEnd;
iter_pointer++;
@@ -186,7 +189,7 @@ RingBuffer::createReadPointer(CallID call_id)
_debug("---- createReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
_readpointer.insert(pair<CallID, int>(call_id, mEnd));
- _debug("---- createReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(),_readpointer.size());
+ _debug("---- createReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(), (int)_readpointer.size());
}
@@ -198,7 +201,7 @@ RingBuffer::removeReadPointer(CallID call_id)
_debug("---- removeReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
_readpointer.erase(call_id);
- _debug("---- removeReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(), _readpointer.size());
+ _debug("---- removeReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(), (int)_readpointer.size());
}
diff --git a/sflphone-common/src/audio/ringbuffer.h b/sflphone-common/src/audio/ringbuffer.h
index 9dc97cc5675fd804d3976d6dcd7baebf5203dbfc..ac559e98c1db50c4571d33f8ea97e5c508e03125 100644
--- a/sflphone-common/src/audio/ringbuffer.h
+++ b/sflphone-common/src/audio/ringbuffer.h
@@ -48,6 +48,7 @@ class RingBuffer {
*/
~RingBuffer();
+ CallID getBufferId(){ return buffer_id; }
/**
* Reset the counters to 0
diff --git a/sflphone-common/src/dbus/Makefile.am b/sflphone-common/src/dbus/Makefile.am
index 5a2745e257f0048291d1b6e60bf1fdb2d9b2e159..5ca2e42eeb78da476df2e00f775a9dfae787cdeb 100644
--- a/sflphone-common/src/dbus/Makefile.am
+++ b/sflphone-common/src/dbus/Makefile.am
@@ -38,7 +38,7 @@ service_DATA = $(service_in_files:.service.in=.service)
# Rule to make the service file with bindir expanded
$(service_DATA): $(service_in_files) Makefile
- sed -e "s|libexec|$(prefix)/lib/sflphone|" $<> $@
+ sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
EXTRA_DIST = *.xml README
diff --git a/sflphone-common/src/dbus/configurationmanager-introspec.xml b/sflphone-common/src/dbus/configurationmanager-introspec.xml
index be81e7a9a7e186379ffcc31ce147426198d4ddab..7f5eac2ad6bf9104978f3ca794f002dc35d1f5c5 100644
--- a/sflphone-common/src/dbus/configurationmanager-introspec.xml
+++ b/sflphone-common/src/dbus/configurationmanager-introspec.xml
@@ -288,13 +288,6 @@
<method name="switchPopupMode">
</method>
- <method name="setPulseAppVolumeControl">
- </method>
-
- <method name="getPulseAppVolumeControl">
- <arg type="s" name="state" direction="out"/>
- </method>
-
<method name="setSipPort">
<arg type="i" name="port" direction="in"/>
</method>
diff --git a/sflphone-common/src/dbus/configurationmanager.cpp b/sflphone-common/src/dbus/configurationmanager.cpp
index fbd2cd0eafbb08a7b517b69fd965b6933f16c736..0a73795acb92384280c0d59a530f6d799d212097 100644
--- a/sflphone-common/src/dbus/configurationmanager.cpp
+++ b/sflphone-common/src/dbus/configurationmanager.cpp
@@ -699,18 +699,6 @@ ConfigurationManager::getMailNotify (void)
return Manager::instance().getMailNotify();
}
-std::string
-ConfigurationManager::getPulseAppVolumeControl (void)
-{
- return Manager::instance().getPulseAppVolumeControl();
-}
-
-void
-ConfigurationManager::setPulseAppVolumeControl (void)
-{
- Manager::instance().setPulseAppVolumeControl();
-}
-
int32_t
ConfigurationManager::getSipPort (void)
{
diff --git a/sflphone-common/src/dbus/configurationmanager.h b/sflphone-common/src/dbus/configurationmanager.h
index ad05b7b4768366e0ee4821b14692740e5313f72e..1592709cb14e0ec552f4f844b74944a72964c9a5 100644
--- a/sflphone-common/src/dbus/configurationmanager.h
+++ b/sflphone-common/src/dbus/configurationmanager.h
@@ -113,8 +113,6 @@ public:
void setNotify( void );
int32_t getMailNotify( void );
void setMailNotify( void );
- std::string getPulseAppVolumeControl( void );
- void setPulseAppVolumeControl( void );
int32_t getSipPort( void );
void setSipPort( const int32_t& portNum);
diff --git a/sflphone-common/src/iax/iaxvoiplink.cpp b/sflphone-common/src/iax/iaxvoiplink.cpp
index 1507f39a1d4342e64c8e4b8fe5a7b8fd8845cb4f..920eb6a87338bdbdfaa46c9544e61338d8f6b6df 100644
--- a/sflphone-common/src/iax/iaxvoiplink.cpp
+++ b/sflphone-common/src/iax/iaxvoiplink.cpp
@@ -38,244 +38,254 @@
#define MUSIC_ONHOLD true
#define CHK_VALID_CALL if (call == NULL) { _debug("IAX: Call doesn't exists\n"); \
- return false; }
+ return false; }
-IAXVoIPLink::IAXVoIPLink (const AccountID& accountID)
- : VoIPLink (accountID)
+ IAXVoIPLink::IAXVoIPLink (const AccountID& accountID)
+: VoIPLink (accountID)
{
- // _debug("IAXVoIPLink::IAXVoIPLink : creating eventhread \n ");
- _evThread = new EventThread (this);
- _regSession = NULL;
- _nextRefreshStamp = 0;
+ // _debug("IAXVoIPLink::IAXVoIPLink : creating eventhread \n ");
+ _evThread = new EventThread (this);
+ _regSession = NULL;
+ _nextRefreshStamp = 0;
+ countTime = 0;
- // to get random number for RANDOM_PORT
- srand (time (NULL));
+ // to get random number for RANDOM_PORT
+ srand (time (NULL));
- audiolayer = NULL;
+ audiolayer = NULL;
- converter = new SamplerateConverter();
+ converter = new SamplerateConverter();
- int nbSamplesMax = (int) (converter->getFrequence() * converter->getFramesize() / 1000);
+ int nbSamplesMax = (int) (converter->getFrequence() * converter->getFramesize() / 1000);
- micData = new SFLDataFormat[nbSamplesMax];
- micDataConverted = new SFLDataFormat[nbSamplesMax];
- micDataEncoded = new unsigned char[nbSamplesMax];
+ micData = new SFLDataFormat[nbSamplesMax];
+ micDataConverted = new SFLDataFormat[nbSamplesMax];
+ micDataEncoded = new unsigned char[nbSamplesMax];
- spkrDataConverted = new SFLDataFormat[nbSamplesMax];
- spkrDataDecoded = new SFLDataFormat[nbSamplesMax];
+ spkrDataConverted = new SFLDataFormat[nbSamplesMax];
+ spkrDataDecoded = new SFLDataFormat[nbSamplesMax];
- urlhook = new UrlHook ();
+ urlhook = new UrlHook ();
}
IAXVoIPLink::~IAXVoIPLink()
{
- delete _evThread;
- _evThread = NULL;
- _regSession = NULL; // shall not delete it
- terminate();
-
- audiolayer = NULL;
-
- delete converter;
-
- delete [] micData;
- micData = NULL;
- delete [] micDataConverted;
- micDataConverted = NULL;
- delete [] micDataEncoded;
- micDataEncoded = NULL;
-
- delete [] spkrDataDecoded;
- spkrDataDecoded = NULL;
- delete [] spkrDataConverted;
- spkrDataConverted = NULL;
+ delete _evThread;
+ _evThread = NULL;
+ _regSession = NULL; // shall not delete it
+ terminate();
+
+ audiolayer = NULL;
+
+ delete converter;
+
+ delete [] micData;
+ micData = NULL;
+ delete [] micDataConverted;
+ micDataConverted = NULL;
+ delete [] micDataEncoded;
+ micDataEncoded = NULL;
+
+ delete [] spkrDataDecoded;
+ spkrDataDecoded = NULL;
+ delete [] spkrDataConverted;
+ spkrDataConverted = NULL;
}
-bool
+ bool
IAXVoIPLink::init()
{
- // If it was done, don't do it again, until we call terminate()
- if (initDone())
- return false;
+ // If it was done, don't do it again, until we call terminate()
+ if (initDone())
+ return false;
- bool returnValue = false;
+ bool returnValue = false;
- // _localAddress = "127.0.0.1";
- // port 0 is default
- // iax_enable_debug(); have to enable debug when compiling iax...
- int port = IAX_DEFAULT_PORTNO;
+ // _localAddress = "127.0.0.1";
+ // port 0 is default
+ // iax_enable_debug(); have to enable debug when compiling iax...
+ int port = IAX_DEFAULT_PORTNO;
- int last_port = 0;
+ int last_port = 0;
- int nbTry = 3;
+ int nbTry = 3;
- while (port != IAX_FAILURE && nbTry) {
- last_port = port;
- port = iax_init (port);
+ while (port != IAX_FAILURE && nbTry) {
+ last_port = port;
+ port = iax_init (port);
- if (port < 0) {
- _debug ("IAX Warning: already initialize on port %d\n", last_port);
- port = RANDOM_IAX_PORT;
- } else if (port == IAX_FAILURE) {
- _debug ("IAX Fail to start on port %d", last_port);
- port = RANDOM_IAX_PORT;
- } else {
- _debug ("IAX Info: listening on port %d\n", last_port);
- _localPort = last_port;
- returnValue = true;
- _evThread->start();
+ if (port < 0) {
+ _debug ("IAX Warning: already initialize on port %d\n", last_port);
+ port = RANDOM_IAX_PORT;
+ } else if (port == IAX_FAILURE) {
+ _debug ("IAX Fail to start on port %d", last_port);
+ port = RANDOM_IAX_PORT;
+ } else {
+ _debug ("IAX Info: listening on port %d\n", last_port);
+ _localPort = last_port;
+ returnValue = true;
+ _evThread->start();
- audiolayer = Manager::instance().getAudioDriver();
+ audiolayer = Manager::instance().getAudioDriver();
- // may be different than one already setted
- converterSamplingRate = audiolayer->getMainBuffer()->getInternalSamplingRate();
-
- break;
- }
+ // may be different than one already setted
+ converterSamplingRate = audiolayer->getMainBuffer()->getInternalSamplingRate();
- nbTry--;
+ break;
+ }
- initDone (true);
- }
+ nbTry--;
- if (port == IAX_FAILURE || nbTry==0) {
- _debug ("Fail to initialize iax\n");
+ initDone (true);
+ }
- initDone (false);
- }
+ if (port == IAX_FAILURE || nbTry==0) {
+ _debug ("Fail to initialize iax\n");
+
+ initDone (false);
+ }
- return returnValue;
+ return returnValue;
}
-void
+ void
IAXVoIPLink::terminate()
{
- // If it was done, don't do it again, until we call init()
- if (!initDone())
- return;
+ // If it was done, don't do it again, until we call init()
+ if (!initDone())
+ return;
- // iaxc_shutdown();
+ // iaxc_shutdown();
- // Hangup all calls
- terminateIAXCall();
+ // Hangup all calls
+ terminateIAXCall();
- initDone (false);
+ initDone (false);
}
-void
+ void
IAXVoIPLink::terminateIAXCall()
{
- std::string reason = "Dumped Call";
- ost::MutexLock m (_callMapMutex);
- CallMap::iterator iter = _callMap.begin();
- IAXCall *call;
-
- while (iter != _callMap.end()) {
- call = dynamic_cast<IAXCall*> (iter->second);
-
- if (call) {
- _mutexIAX.enterMutex();
- iax_hangup (call->getSession(), (char*) reason.c_str());
- _mutexIAX.leaveMutex();
- call->setSession (NULL);
- delete call;
- call = NULL;
- }
-
- iter++;
- }
+ std::string reason = "Dumped Call";
+ ost::MutexLock m (_callMapMutex);
+ CallMap::iterator iter = _callMap.begin();
+ IAXCall *call;
+
+ while (iter != _callMap.end()) {
+ call = dynamic_cast<IAXCall*> (iter->second);
+
+ if (call) {
+ _mutexIAX.enterMutex();
+ iax_hangup (call->getSession(), (char*) reason.c_str());
+ _mutexIAX.leaveMutex();
+ call->setSession (NULL);
+ delete call;
+ call = NULL;
+ }
- _callMap.clear();
+ iter++;
+ }
+
+ _callMap.clear();
}
void IAXVoIPLink::terminateOneCall (const CallID& id)
{
- IAXCall* call = getIAXCall (id);
+ IAXCall* call = getIAXCall (id);
- if (call) {
- _debug ("IAXVoIPLink::terminateOneCall()::the call is deleted, should close recording file \n");
- delete call;
- call = 0;
- }
+ if (call) {
+ _debug ("IAXVoIPLink::terminateOneCall()::the call is deleted, should close recording file \n");
+ delete call;
+ call = 0;
+ }
}
-void
+ void
IAXVoIPLink::getEvent()
{
- IAXCall* call = NULL;
+ IAXCall* call = NULL;
- // lock iax_ stuff..
- _mutexIAX.enterMutex();
- iax_event* event = NULL;
+ // lock iax_ stuff..
+ _mutexIAX.enterMutex();
+ iax_event* event = NULL;
-
+ while ( (event = iax_get_event (IAX_NONBLOCKING)) != NULL) {
+ // If we received an 'ACK', libiax2 tells apps to ignore them.
+ if (event->etype == IAX_EVENT_NULL) {
+ continue;
+ }
- while ( (event = iax_get_event (IAX_NONBLOCKING)) != NULL) {
- // If we received an 'ACK', libiax2 tells apps to ignore them.
- if (event->etype == IAX_EVENT_NULL) {
- continue;
- }
+ //_debug ("Receive IAX Event: %d (0x%x)\n", event->etype, event->etype);
- //_debug ("Receive IAX Event: %d (0x%x)\n", event->etype, event->etype);
+ call = iaxFindCallBySession (event->session);
- call = iaxFindCallBySession (event->session);
+ if (call) {
+ // We know that call, deal with it
+ iaxHandleCallEvent (event, call);
+ //_audiocodec = Manager::instance().getCodecDescriptorMap().getCodec( call -> getAudioCodec() );
+ } else if (event->session && event->session == _regSession) {
+ // This is a registration session, deal with it
+ iaxHandleRegReply (event);
+ } else {
+ // We've got an event before it's associated with any call
+ iaxHandlePrecallEvent (event);
+ }
- if (call) {
- // We know that call, deal with it
- iaxHandleCallEvent (event, call);
- //_audiocodec = Manager::instance().getCodecDescriptorMap().getCodec( call -> getAudioCodec() );
- } else if (event->session && event->session == _regSession) {
- // This is a registration session, deal with it
- iaxHandleRegReply (event);
- } else {
- // We've got an event before it's associated with any call
- iaxHandlePrecallEvent (event);
- }
+ // _debug("IAXVoIPLink::getEvent() : timestamp %i \n",event->ts);
- // _debug("IAXVoIPLink::getEvent() : timestamp %i \n",event->ts);
+ iax_event_free (event);
+ }
- iax_event_free (event);
- }
+ _mutexIAX.leaveMutex();
- _mutexIAX.leaveMutex();
+ sendAudioFromMic();
+ if (call) {
+ call->recAudio.recData (spkrDataDecoded, micData, nbSampleForRec_, nbSampleForRec_);
- if (call) {
- call->recAudio.recData (spkrDataConverted,micData,nbSampleForRec_,nbSampleForRec_);
+ // Do the doodle-moodle to send audio from the microphone to the IAX channel.
+ }
+
+ // Do the doodle-moodle to send audio from the microphone to the IAX channel.
+ // sendAudioFromMic();
- // Do the doodle-moodle to send audio from the microphone to the IAX channel.
- sendAudioFromMic();
- }
+ // Refresh registration.
+ if (_nextRefreshStamp && _nextRefreshStamp - 2 < time (NULL)) {
+ sendRegister ("");
+ }
- // Do the doodle-moodle to send audio from the microphone to the IAX channel.
- // sendAudioFromMic();
+ // Notify (with a beep) an incoming call when there is already a call
+ countTime += 3;
- // Refresh registration.
- if (_nextRefreshStamp && _nextRefreshStamp - 2 < time (NULL)) {
- sendRegister ("");
- }
+ if((Manager::instance().incomingCallWaiting() > 0) && Manager::instance().hasCurrentCall()) {
+ int countTime_modulo = countTime % 4000;
+ // _debug("countTime: %i\n", countTime);
+ // _debug("countTime_modulo: %i\n", countTime_modulo);
+ if ((countTime_modulo - countTime) < 0) {
+ Manager::instance().notificationIncomingCall();
+ }
- // thread wait 3 millisecond
- _evThread->sleep (3);
+ countTime = countTime_modulo;
+ }
- free (event);
+ // thread wait 3 millisecond
+ _evThread->sleep (3);
+
+ free (event);
}
-void
+ void
IAXVoIPLink::sendAudioFromMic (void)
{
- // _debug("IAXVoIPLink::sendAudioFromMic");
int maxBytesToGet, availBytesFromMic, bytesAvail, compSize;
AudioCodec *ac;
IAXCall *currentCall;
-
-
// We have to update the audio layer type in case we switched
// TODO Find out a better way to do it
updateAudiolayer();
@@ -284,899 +294,871 @@ IAXVoIPLink::sendAudioFromMic (void)
// currentCall = getIAXCall (Manager::instance().getCurrentCallId());
CallMap::iterator iter_call = _callMap.begin();
- while(iter_call != _callMap.end())
-
- {
+ while(iter_call != _callMap.end()) {
- currentCall = (IAXCall*)iter_call->second;
+ currentCall = (IAXCall*)iter_call->second;
- if (!currentCall) {
+ iter_call++;
- _debug("Error no iax call with id \"%s\"\n", Manager::instance().getCurrentCallId().c_str());
- // Let's mind our own business.
- return;
- }
+ if (currentCall) {
-
+ bool sessionIsConnected = (currentCall->getConnectionState() == Call::Connected);
+ bool callIsActive = (currentCall->getState() == Call::Active);
- // if (currentCall -> getAudioCodec() < 0)
- // return;
+ // if (sessionIsConnected || callIsActive) {
+ if (callIsActive) {
+
+ ac = currentCall->getCodecMap().getCodec(currentCall->getAudioCodec());
- // Just make sure the currentCall is in state to receive audio right now.
- //_debug("Here we get: connectionState: %d state: %d \n",
- //currentCall->getConnectionState(),
- //currentCall->getState());
-
- if (currentCall->getConnectionState() != Call::Connected ||
- currentCall->getState() != Call::Active) {
- _debug("IAX Call not connected or not active\n");
- return;
- }
+ // Send sound here
+ if (ac && audiolayer) {
-
- ac = currentCall->getCodecMap().getCodec(currentCall->getAudioCodec());
-
- if (!ac) {
- // Audio codec still not determined.
- _debug("Error no audio codec determined!\n");
- _debug("Cannot found audio codec %i\n", currentCall->getAudioCodec());
-
- if (audiolayer) {
- // To keep latency low..
- audiolayer->getMainBuffer()->flush(currentCall->getCallId());
- }
-
+ // _debug("Send sound\n");
+ // audiolayer->getMainBuffer()->flush(currentCall->getCallId());
- return;
- }
+ audiolayer->getMainBuffer()->setInternalSamplingRate(ac->getClockRate());
- // Send sound here
- if (audiolayer) {
+ int _mainBufferSampleRate = audiolayer->getMainBuffer()->getInternalSamplingRate();
- // _debug("Send sound\n");
+ // we have to get 20ms of data from the mic *20/1000 = /50
+ // rate/50 shall be lower than IAX__20S_48KHZ_MAX
+ maxBytesToGet = _mainBufferSampleRate * audiolayer->getFrameSize() / 1000 * sizeof (SFLDataFormat);
- audiolayer->getMainBuffer()->setInternalSamplingRate(ac->getClockRate());
+ // available bytes inside ringbuffer
+ availBytesFromMic = audiolayer->getMainBuffer()->availForGet(currentCall->getCallId());
+ // We need packets full!
+ if (availBytesFromMic > maxBytesToGet) {
- int _mainBufferSampleRate = audiolayer->getMainBuffer()->getInternalSamplingRate();
+ // take the lowest
+ bytesAvail = (availBytesFromMic < maxBytesToGet) ? availBytesFromMic : maxBytesToGet;
- // we have to get 20ms of data from the mic *20/1000 = /50
- // rate/50 shall be lower than IAX__20S_48KHZ_MAX
- maxBytesToGet = _mainBufferSampleRate * audiolayer->getFrameSize() / 1000 * sizeof (SFLDataFormat);
+ // Get bytes from micRingBuffer to data_from_mic
+ nbSample_ = audiolayer->getMainBuffer()->getData (micData, bytesAvail, 100, currentCall->getCallId()) / sizeof (SFLDataFormat);
- // available bytes inside ringbuffer
- availBytesFromMic = audiolayer->getMainBuffer()->availForGet(currentCall->getCallId());
-
- if (availBytesFromMic < maxBytesToGet) {
- // We need packets full!
- _debug("Packet not full for call %s\n", currentCall->getCallId().c_str());
- _debug(" availBytesFromMic: %i\n", availBytesFromMic);
- _debug(" maxBytesToGet: %i\n", maxBytesToGet);
- return;
- }
- // take the lowest
- bytesAvail = (availBytesFromMic < maxBytesToGet) ? availBytesFromMic : maxBytesToGet;
-
+ // Store the number of samples for recording
+ nbSampleForRec_ = nbSample_;
- // Get bytes from micRingBuffer to data_from_mic
- nbSample_ = audiolayer->getMainBuffer()->getData (micData, bytesAvail, 100, currentCall->getCallId()) / sizeof (SFLDataFormat);
+ if (ac->getClockRate() && (ac->getClockRate() != _mainBufferSampleRate)) {
- // Store the number of samples for recording
- nbSampleForRec_ = nbSample_;
+ // resample
+ nbSample_ = converter->downsampleData (micData , micDataConverted , (int) ac->getClockRate(), _mainBufferSampleRate, nbSample_);
+ // for the mono: range = 0 to IAX_FRAME2SEND * sizeof(int16)
+ compSize = ac->codecEncode (micDataEncoded, micDataConverted , nbSample_*sizeof (int16));
- if (ac->getClockRate() && (ac->getClockRate() != _mainBufferSampleRate)) {
+ } else {
- // resample
- nbSample_ = converter->downsampleData (micData , micDataConverted , (int) ac->getClockRate(), _mainBufferSampleRate, nbSample_);
-
- // for the mono: range = 0 to IAX_FRAME2SEND * sizeof(int16)
- compSize = ac->codecEncode (micDataEncoded, micDataConverted , nbSample_*sizeof (int16));
+ // for the mono: range = 0 to IAX_FRAME2SEND * sizeof(int16)
+ compSize = ac->codecEncode (micDataEncoded, micData, nbSample_*sizeof (int16));
+
+ }
- } else {
-
- // for the mono: range = 0 to IAX_FRAME2SEND * sizeof(int16)
- compSize = ac->codecEncode (micDataEncoded, micData, nbSample_*sizeof (int16));
+ // Send it out!
+ _mutexIAX.enterMutex();
- }
+ // Make sure the session and the call still exists.
+ if (currentCall->getSession() && micDataEncoded != NULL) {
+ if (iax_send_voice (currentCall->getSession(), currentCall->getFormat(), micDataEncoded, compSize, nbSample_) == -1) {
+ _debug ("IAX: Error sending voice data.\n");
+ }
+ }
- // Send it out!
- _mutexIAX.enterMutex();
+ _mutexIAX.leaveMutex();
- // Make sure the session and the call still exists.
- if (currentCall->getSession() && micDataEncoded != NULL) {
- if (iax_send_voice (currentCall->getSession(), currentCall->getFormat(), micDataEncoded, compSize, nbSample_) == -1) {
- _debug ("IAX: Error sending voice data.\n");
+ }
}
+
}
-
- _mutexIAX.leaveMutex();
+
}
-
- iter_call++;
-
+
}
}
-IAXCall*
+ IAXCall*
IAXVoIPLink::getIAXCall (const CallID& id)
{
- Call* call = getCall (id);
+ Call* call = getCall (id);
- if (call) {
- return dynamic_cast<IAXCall*> (call);
- }
+ if (call) {
+ return dynamic_cast<IAXCall*> (call);
+ }
- return NULL;
+ return NULL;
}
-int
+ int
IAXVoIPLink::sendRegister (AccountID id)
{
- IAXAccount *account;
- bool result;
-
- result = false;
- account = dynamic_cast<IAXAccount *> (getAccountPtr());
+ IAXAccount *account;
+ bool result;
- if (account->getHostname().empty()) {
- return false;
- }
+ result = false;
+ account = dynamic_cast<IAXAccount *> (getAccountPtr());
- if (account->getUsername().empty()) {
- return false;
- }
+ if (account->getHostname().empty()) {
+ return false;
+ }
- // lock
- _mutexIAX.enterMutex();
+ if (account->getUsername().empty()) {
+ return false;
+ }
- // Always use a brand new session
- if (_regSession) {
- iax_destroy (_regSession);
- }
+ // lock
+ _mutexIAX.enterMutex();
- _regSession = iax_session_new();
+ // Always use a brand new session
+ if (_regSession) {
+ iax_destroy (_regSession);
+ }
- if (!_regSession) {
- _debug ("Error when generating new session for register");
- } else {
- _debug ("IAX Sending registration to %s with user %s\n", account->getHostname().c_str() , account->getUsername().c_str());
- int val = iax_register (_regSession, account->getHostname().data(), account->getUsername().data(), account->getPassword().data(), 120);
- _debug ("Return value: %d\n", val);
- // set the time-out to 15 seconds, after that, resend a registration request.
- // until we unregister.
- _nextRefreshStamp = time (NULL) + 10;
- result = true;
+ _regSession = iax_session_new();
- account->setRegistrationState (Trying);
- }
+ if (!_regSession) {
+ _debug ("Error when generating new session for register");
+ } else {
+ _debug ("IAX Sending registration to %s with user %s\n", account->getHostname().c_str() , account->getUsername().c_str());
+ int val = iax_register (_regSession, account->getHostname().data(), account->getUsername().data(), account->getPassword().data(), 120);
+ _debug ("Return value: %d\n", val);
+ // set the time-out to 15 seconds, after that, resend a registration request.
+ // until we unregister.
+ _nextRefreshStamp = time (NULL) + 10;
+ result = true;
+
+ account->setRegistrationState (Trying);
+ }
- // unlock
- _mutexIAX.leaveMutex();
+ // unlock
+ _mutexIAX.leaveMutex();
- return result;
+ return result;
}
-int
+ int
IAXVoIPLink::sendUnregister (AccountID id)
{
- IAXAccount *account;
+ IAXAccount *account;
- account = dynamic_cast<IAXAccount*> (getAccountPtr());
+ account = dynamic_cast<IAXAccount*> (getAccountPtr());
- if (!account)
- return 1;
+ if (!account)
+ return 1;
- _mutexIAX.enterMutex();
+ _mutexIAX.enterMutex();
- if (_regSession) {
- /** @todo Should send a REGREL in sendUnregister()... */
- //iax_send_regrel(); doesn't exist yet :)
- iax_destroy (_regSession);
- _regSession = NULL;
- }
+ if (_regSession) {
+ /** @todo Should send a REGREL in sendUnregister()... */
+ //iax_send_regrel(); doesn't exist yet :)
+ iax_destroy (_regSession);
+ _regSession = NULL;
+ }
- _mutexIAX.leaveMutex();
+ _mutexIAX.leaveMutex();
- _nextRefreshStamp = 0;
+ _nextRefreshStamp = 0;
- _debug ("IAX2 send unregister\n");
- account->setRegistrationState (Unregistered);
+ _debug ("IAX2 send unregister\n");
+ account->setRegistrationState (Unregistered);
- return SUCCESS;
+ return SUCCESS;
}
-Call*
+ Call*
IAXVoIPLink::newOutgoingCall (const CallID& id, const std::string& toUrl)
{
- IAXCall* call = new IAXCall (id, Call::Outgoing);
- call->setCodecMap (Manager::instance().getCodecDescriptorMap());
-
- if (call) {
- call->setPeerNumber (toUrl);
- call->initRecFileName();
-
- if (iaxOutgoingInvite (call)) {
- call->setConnectionState (Call::Progressing);
- call->setState (Call::Active);
- addCall (call);
- } else {
- delete call;
- call = NULL;
- }
- }
+ IAXCall* call = new IAXCall (id, Call::Outgoing);
+ call->setCodecMap (Manager::instance().getCodecDescriptorMap());
+
+ if (call) {
+ call->setPeerNumber (toUrl);
+ call->initRecFileName();
+
+ if (iaxOutgoingInvite (call)) {
+ call->setConnectionState (Call::Progressing);
+ call->setState (Call::Active);
+ addCall (call);
+ } else {
+ delete call;
+ call = NULL;
+ }
+ }
- return call;
+ return call;
}
-bool
+ bool
IAXVoIPLink::answer (const CallID& id)
{
- IAXCall* call = getIAXCall (id);
- call->setCodecMap (Manager::instance().getCodecDescriptorMap());
+ IAXCall* call = getIAXCall (id);
+ call->setCodecMap (Manager::instance().getCodecDescriptorMap());
+
+ Manager::instance().addStream(call->getCallId());
- Manager::instance().addStream(call->getCallId());
+ CHK_VALID_CALL;
- CHK_VALID_CALL;
+ _mutexIAX.enterMutex();
+ iax_answer (call->getSession());
+ _mutexIAX.leaveMutex();
- _mutexIAX.enterMutex();
- iax_answer (call->getSession());
- _mutexIAX.leaveMutex();
+ call->setState (Call::Active);
+ call->setConnectionState (Call::Connected);
- call->setState (Call::Active);
- call->setConnectionState (Call::Connected);
- // Start audio
- // audiolayer->startStream();
+ // Flush main buffer
+ audiolayer->flushMain();
- return true;
+ return true;
}
-bool
+ bool
IAXVoIPLink::hangup (const CallID& id)
{
- _debug ("IAXVoIPLink::hangup() : function called once hangup \n");
- IAXCall* call = getIAXCall (id);
- std::string reason = "Dumped Call";
- CHK_VALID_CALL;
+ _debug ("IAXVoIPLink::hangup() : function called once hangup \n");
+ IAXCall* call = getIAXCall (id);
+ std::string reason = "Dumped Call";
+ CHK_VALID_CALL;
- audiolayer->getMainBuffer()->unBindAll(call->getCallId());
+ audiolayer->getMainBuffer()->unBindAll(call->getCallId());
- _mutexIAX.enterMutex();
+ _mutexIAX.enterMutex();
- iax_hangup (call->getSession(), (char*) reason.c_str());
- _mutexIAX.leaveMutex();
- call->setSession (NULL);
+ iax_hangup (call->getSession(), (char*) reason.c_str());
+ _mutexIAX.leaveMutex();
+ call->setSession (NULL);
- if (Manager::instance().isCurrentCall (id)) {
- // stop audio
- // audiolayer->stopStream();
- }
+ if (Manager::instance().isCurrentCall (id)) {
+ // stop audio
+ // audiolayer->stopStream();
+ }
- terminateOneCall (id);
+ terminateOneCall (id);
- removeCall (id);
- return true;
+ removeCall (id);
+ return true;
}
-bool
+ bool
IAXVoIPLink::peerHungup (const CallID& id)
{
- _debug ("IAXVoIPLink::peerHangup() : function called once hangup \n");
- IAXCall* call = getIAXCall (id);
- std::string reason = "Dumped Call";
- CHK_VALID_CALL;
+ _debug ("IAXVoIPLink::peerHangup() : function called once hangup \n");
+ IAXCall* call = getIAXCall (id);
+ std::string reason = "Dumped Call";
+ CHK_VALID_CALL;
- audiolayer->getMainBuffer()->unBindAll(call->getCallId());
+ audiolayer->getMainBuffer()->unBindAll(call->getCallId());
- _mutexIAX.enterMutex();
+ _mutexIAX.enterMutex();
- _mutexIAX.leaveMutex();
- call->setSession (NULL);
+ _mutexIAX.leaveMutex();
+ call->setSession (NULL);
- if (Manager::instance().isCurrentCall (id)) {
- // stop audio
- // audiolayer->stopStream();
- }
+ if (Manager::instance().isCurrentCall (id)) {
+ // stop audio
+ // audiolayer->stopStream();
+ }
- terminateOneCall (id);
+ terminateOneCall (id);
- removeCall (id);
- return true;
+ removeCall (id);
+ return true;
}
-bool
+ bool
IAXVoIPLink::onhold (const CallID& id)
{
- IAXCall* call = getIAXCall (id);
+ IAXCall* call = getIAXCall (id);
- CHK_VALID_CALL;
+ CHK_VALID_CALL;
- audiolayer->getMainBuffer()->unBindAll(call->getCallId());
+ audiolayer->getMainBuffer()->unBindAll(call->getCallId());
- //if (call->getState() == Call::Hold) { _debug("Call is already on hold\n"); return false; }
+ //if (call->getState() == Call::Hold) { _debug("Call is already on hold\n"); return false; }
- _mutexIAX.enterMutex();
- iax_quelch_moh (call->getSession() , MUSIC_ONHOLD);
- _mutexIAX.leaveMutex();
+ _mutexIAX.enterMutex();
+ iax_quelch_moh (call->getSession() , MUSIC_ONHOLD);
+ _mutexIAX.leaveMutex();
- call->setState (Call::Hold);
- return true;
+ call->setState (Call::Hold);
+ return true;
}
-bool
+ bool
IAXVoIPLink::offhold (const CallID& id)
{
- IAXCall* call = getIAXCall (id);
+ IAXCall* call = getIAXCall (id);
- CHK_VALID_CALL;
+ CHK_VALID_CALL;
- Manager::instance().addStream(call->getCallId());
+ Manager::instance().addStream(call->getCallId());
- //if (call->getState() == Call::Active) { _debug("Call is already active\n"); return false; }
- _mutexIAX.enterMutex();
- iax_unquelch (call->getSession());
- _mutexIAX.leaveMutex();
- audiolayer->startStream();
- call->setState (Call::Active);
- return true;
+ //if (call->getState() == Call::Active) { _debug("Call is already active\n"); return false; }
+ _mutexIAX.enterMutex();
+ iax_unquelch (call->getSession());
+ _mutexIAX.leaveMutex();
+ audiolayer->startStream();
+ call->setState (Call::Active);
+ return true;
}
-bool
+ bool
IAXVoIPLink::transfer (const CallID& id, const std::string& to)
{
- IAXCall* call = getIAXCall (id);
+ IAXCall* call = getIAXCall (id);
- CHK_VALID_CALL;
+ CHK_VALID_CALL;
- char callto[to.length() +1];
- strcpy (callto, to.c_str());
+ char callto[to.length() +1];
+ strcpy (callto, to.c_str());
- _mutexIAX.enterMutex();
- iax_transfer (call->getSession(), callto);
- _mutexIAX.leaveMutex();
+ _mutexIAX.enterMutex();
+ iax_transfer (call->getSession(), callto);
+ _mutexIAX.leaveMutex();
- return true;
+ return true;
- // should we remove it?
- // removeCall(id);
+ // should we remove it?
+ // removeCall(id);
}
-bool
+ bool
IAXVoIPLink::refuse (const CallID& id)
{
- IAXCall* call = getIAXCall (id);
- std::string reason = "Call rejected manually.";
+ IAXCall* call = getIAXCall (id);
+ std::string reason = "Call rejected manually.";
- CHK_VALID_CALL;
+ CHK_VALID_CALL;
- _mutexIAX.enterMutex();
- iax_reject (call->getSession(), (char*) reason.c_str());
- _mutexIAX.leaveMutex();
+ _mutexIAX.enterMutex();
+ iax_reject (call->getSession(), (char*) reason.c_str());
+ _mutexIAX.leaveMutex();
- // terminateOneCall(id);
- removeCall (id);
+ // terminateOneCall(id);
+ removeCall (id);
- return true;
+ return true;
}
-bool
+ bool
IAXVoIPLink::carryingDTMFdigits (const CallID& id, char code)
{
- IAXCall* call = getIAXCall (id);
+ IAXCall* call = getIAXCall (id);
- CHK_VALID_CALL;
+ CHK_VALID_CALL;
- _mutexIAX.enterMutex();
- iax_send_dtmf (call->getSession(), code);
- _mutexIAX.leaveMutex();
+ _mutexIAX.enterMutex();
+ iax_send_dtmf (call->getSession(), code);
+ _mutexIAX.leaveMutex();
- return true;
+ return true;
}
-std::string
+ std::string
IAXVoIPLink::getCurrentCodecName()
{
- IAXCall *call = NULL;
- AudioCodec *ac = NULL;
- std::string name = "";
+ IAXCall *call = NULL;
+ AudioCodec *ac = NULL;
+ std::string name = "";
- call = getIAXCall (Manager::instance().getCurrentCallId());
+ call = getIAXCall (Manager::instance().getCurrentCallId());
- if(call)
- ac = call->getCodecMap().getCodec (call->getAudioCodec());
+ if(call)
+ ac = call->getCodecMap().getCodec (call->getAudioCodec());
- if(ac)
- name = ac->getCodecName();
-
- return name;
+ if(ac)
+ name = ac->getCodecName();
+
+ return name;
}
-bool
+ bool
IAXVoIPLink::iaxOutgoingInvite (IAXCall* call)
{
- struct iax_session *newsession;
- ost::MutexLock m (_mutexIAX);
- std::string username, strNum;
- char *lang=NULL;
- int wait, audio_format_preferred, audio_format_capability;
- IAXAccount *account;
+ struct iax_session *newsession;
+ ost::MutexLock m (_mutexIAX);
+ std::string username, strNum;
+ char *lang=NULL;
+ int wait, audio_format_preferred, audio_format_capability;
+ IAXAccount *account;
- newsession = iax_session_new();
+ newsession = iax_session_new();
- if (!newsession) {
- _debug ("IAX Error: Can't make new session for a new call\n");
- return false;
- }
+ if (!newsession) {
+ _debug ("IAX Error: Can't make new session for a new call\n");
+ return false;
+ }
- call->setSession (newsession);
+ call->setSession (newsession);
- account = dynamic_cast<IAXAccount*> (getAccountPtr());
- username = account->getUsername();
- strNum = username + ":" + account->getPassword() + "@" + account->getHostname() + "/" + call->getPeerNumber();
+ account = dynamic_cast<IAXAccount*> (getAccountPtr());
+ username = account->getUsername();
+ strNum = username + ":" + account->getPassword() + "@" + account->getHostname() + "/" + call->getPeerNumber();
- wait = 0;
- /** @todo Make preference dynamic, and configurable */
- audio_format_preferred = call->getFirstMatchingFormat (call->getSupportedFormat());
- audio_format_capability = call->getSupportedFormat();
+ wait = 0;
+ /** @todo Make preference dynamic, and configurable */
+ audio_format_preferred = call->getFirstMatchingFormat (call->getSupportedFormat());
+ audio_format_capability = call->getSupportedFormat();
- _debug ("IAX New call: %s\n", strNum.c_str());
- iax_call (newsession, username.c_str(), username.c_str(), strNum.c_str(), lang, wait, audio_format_preferred, audio_format_capability);
+ _debug ("IAX New call: %s\n", strNum.c_str());
+ iax_call (newsession, username.c_str(), username.c_str(), strNum.c_str(), lang, wait, audio_format_preferred, audio_format_capability);
- return true;
+ return true;
}
-IAXCall*
+ IAXCall*
IAXVoIPLink::iaxFindCallBySession (struct iax_session* session)
{
- // access to callMap shoud use that
- // the code below is like findSIPCallWithCid()
- ost::MutexLock m (_callMapMutex);
- IAXCall* call = NULL;
- CallMap::iterator iter = _callMap.begin();
+ // access to callMap shoud use that
+ // the code below is like findSIPCallWithCid()
+ ost::MutexLock m (_callMapMutex);
+ IAXCall* call = NULL;
+ CallMap::iterator iter = _callMap.begin();
- while (iter != _callMap.end()) {
- call = dynamic_cast<IAXCall*> (iter->second);
+ while (iter != _callMap.end()) {
+ call = dynamic_cast<IAXCall*> (iter->second);
- if (call && call->getSession() == session) {
- return call;
- }
+ if (call && call->getSession() == session) {
+ return call;
+ }
- iter++;
- }
+ iter++;
+ }
- return NULL; // not found
+ return NULL; // not found
}
-void
+ void
IAXVoIPLink::iaxHandleCallEvent (iax_event* event, IAXCall* call)
{
- // call should not be 0
- // note activity?
- //
- CallID id = call->getCallId();
-
- switch (event->etype) {
-
- case IAX_EVENT_HANGUP:
-
- if (Manager::instance().isCurrentCall (id)) {
- // stop audio
- // audiolayer->stopStream();
- }
-
- Manager::instance().peerHungupCall (id);
-
- /*
- _debug("IAXVoIPLink::iaxHandleCallEvent, peer hangup have been called");
- std::string reason = "Dumped Call";
- _mutexIAX.enterMutex();
- iax_hangup(call->getSession(), (char*)reason.c_str());
- _mutexIAX.leaveMutex();
- call->setSession(NULL);
- audiolayer->stopStream();
- terminateOneCall(id);
- */
- removeCall (id);
- break;
-
- case IAX_EVENT_REJECT:
- //Manager::instance().peerHungupCall(id);
-
- if (Manager::instance().isCurrentCall (id)) {
- // stop audio
- // audiolayer->stopStream();
- }
-
- call->setConnectionState (Call::Connected);
-
- call->setState (Call::Error);
- Manager::instance().callFailure (id);
- // terminateOneCall(id);
- removeCall (id);
- break;
-
- case IAX_EVENT_ACCEPT:
-
- // Call accepted over there by the computer, not the user yet.
- _debug("IAX_EVENT_ACCEPT: codec format: ");
-
- if (event->ies.format) {
- printf("%i\n", event->ies.format);
- call->setFormat (event->ies.format);
- }
- else{
- printf("no codec format\n");
- }
+ // call should not be 0
+ // note activity?
+ //
+ CallID id = call->getCallId();
+
+ switch (event->etype) {
+
+ case IAX_EVENT_HANGUP:
+
+ if (Manager::instance().isCurrentCall (id)) {
+ // stop audio
+ // audiolayer->stopStream();
+ }
+
+ Manager::instance().peerHungupCall (id);
+
+ /*
+ _debug("IAXVoIPLink::iaxHandleCallEvent, peer hangup have been called");
+ std::string reason = "Dumped Call";
+ _mutexIAX.enterMutex();
+ iax_hangup(call->getSession(), (char*)reason.c_str());
+ _mutexIAX.leaveMutex();
+ call->setSession(NULL);
+ audiolayer->stopStream();
+ terminateOneCall(id);
+ */
+ removeCall (id);
+ break;
+
+ case IAX_EVENT_REJECT:
+ //Manager::instance().peerHungupCall(id);
+
+ if (Manager::instance().isCurrentCall (id)) {
+ // stop audio
+ // audiolayer->stopStream();
+ }
- break;
+ call->setConnectionState (Call::Connected);
- case IAX_EVENT_ANSWER:
+ call->setState (Call::Error);
+ Manager::instance().callFailure (id);
+ // terminateOneCall(id);
+ removeCall (id);
+ break;
- if (call->getConnectionState() != Call::Connected) {
+ case IAX_EVENT_ACCEPT:
- Manager::instance().addStream(call->getCallId());
+ // Call accepted over there by the computer, not the user yet.
+ _debug("IAX_EVENT_ACCEPT: codec format: ");
- call->setConnectionState (Call::Connected);
- call->setState (Call::Active);
- // audiolayer->startStream();
+ if (event->ies.format) {
+ printf("%i\n", event->ies.format);
+ call->setFormat (event->ies.format);
+ }
+ else{
+ printf("no codec format\n");
+ }
- _debug("IAX_EVENT_ANSWER: codec format: ");
+ break;
- if (event->ies.format) {
- // Should not get here, should have been set in EVENT_ACCEPT
- printf("%i\n", event->ies.format);
- call->setFormat (event->ies.format);
- }
- {
- printf("no codec format\n");
- }
+ case IAX_EVENT_ANSWER:
- Manager::instance().peerAnsweredCall (id);
+ if (call->getConnectionState() != Call::Connected) {
- // start audio here?
- } else {
- // deja connecté ?
- }
+ Manager::instance().addStream(call->getCallId());
- break;
+ call->setConnectionState (Call::Connected);
+ call->setState (Call::Active);
+ // audiolayer->startStream();
- case IAX_EVENT_BUSY:
- call->setConnectionState (Call::Connected);
- call->setState (Call::Busy);
- Manager::instance().callBusy (id);
- // terminateOneCall(id);
- removeCall (id);
- break;
+ _debug("IAX_EVENT_ANSWER: codec format: ");
- case IAX_EVENT_VOICE:
- //if (!audiolayer->isCaptureActive ())
- // audiolayer->startStream ();
- // _debug("IAX_EVENT_VOICE: \n");
- iaxHandleVoiceEvent (event, call);
- break;
+ if (event->ies.format) {
+ // Should not get here, should have been set in EVENT_ACCEPT
+ printf("%i\n", event->ies.format);
+ call->setFormat (event->ies.format);
+ }
+ {
+ printf("no codec format\n");
+ }
- case IAX_EVENT_TEXT:
- break;
+ Manager::instance().peerAnsweredCall (id);
- case IAX_EVENT_RINGA:
- call->setConnectionState (Call::Ringing);
- Manager::instance().peerRingingCall (call->getCallId());
- break;
+ // start audio here?
+ audiolayer->flushMain();
+ } else {
+ // deja connecté ?
+ }
- case IAX_IE_MSGCOUNT:
- break;
+ break;
- case IAX_EVENT_PONG:
- break;
+ case IAX_EVENT_BUSY:
+ call->setConnectionState (Call::Connected);
+ call->setState (Call::Busy);
+ Manager::instance().callBusy (id);
+ // terminateOneCall(id);
+ removeCall (id);
+ break;
- case IAX_EVENT_URL:
+ case IAX_EVENT_VOICE:
+ //if (!audiolayer->isCaptureActive ())
+ // audiolayer->startStream ();
+ // _debug("IAX_EVENT_VOICE: \n");
+ iaxHandleVoiceEvent (event, call);
+ break;
- if (Manager::instance().getConfigString (HOOKS, URLHOOK_IAX2_ENABLED) == "1") {
- if (strcmp ( (char*) event->data, "") != 0) {
- _debug ("> IAX_EVENT_URL received: %s\n", event->data);
- urlhook->addAction ( (char*) event->data, Manager::instance().getConfigString (HOOKS, URLHOOK_COMMAND));
- }
- }
+ case IAX_EVENT_TEXT:
+ break;
- break;
+ case IAX_EVENT_RINGA:
+ call->setConnectionState (Call::Ringing);
+ Manager::instance().peerRingingCall (call->getCallId());
+ break;
- case IAX_EVENT_TIMEOUT:
- break;
+ case IAX_IE_MSGCOUNT:
+ break;
+
+ case IAX_EVENT_PONG:
+ break;
- case IAX_EVENT_TRANSFER:
- break;
+ case IAX_EVENT_URL:
- default:
- _debug ("iaxHandleCallEvent: Unknown event type (in call event): %d\n", event->etype);
+ if (Manager::instance().getConfigString (HOOKS, URLHOOK_IAX2_ENABLED) == "1") {
+ if (strcmp ( (char*) event->data, "") != 0) {
+ _debug ("> IAX_EVENT_URL received: %s\n", event->data);
+ urlhook->addAction ( (char*) event->data, Manager::instance().getConfigString (HOOKS, URLHOOK_COMMAND));
+ }
+ }
- }
+ break;
+
+ case IAX_EVENT_TIMEOUT:
+ break;
+
+ case IAX_EVENT_TRANSFER:
+ break;
+
+ default:
+ _debug ("iaxHandleCallEvent: Unknown event type (in call event): %d\n", event->etype);
+
+ }
}
/* Handle audio event, VOICE packet received */
-void
+ void
IAXVoIPLink::iaxHandleVoiceEvent (iax_event* event, IAXCall* call)
{
- unsigned char *data;
- unsigned int size, max, nbInt16;
- int expandedSize, nbSample_;
- AudioCodec *ac;
+ unsigned char *data;
+ unsigned int size, max, nbInt16;
+ int expandedSize, nbSample_;
+ AudioCodec *ac;
if (!call)
return;
if (!event->datalen) {
- // Skip this empty packet.
- //_debug("IAX: Skipping empty jitter-buffer interpolated packet\n");
- return;
- }
+ // Skip this empty packet.
+ //_debug("IAX: Skipping empty jitter-buffer interpolated packet\n");
+ return;
+ }
- ac = call->getCodecMap ().getCodec (call->getAudioCodec ());
+ ac = call->getCodecMap ().getCodec (call->getAudioCodec ());
if (!ac)
return;
-
+
if (audiolayer) {
audiolayer->getMainBuffer ()->setInternalSamplingRate (ac->getClockRate ());
-
+
// If we receive datalen == 0, some things of the jitter buffer in libiax2/iax.c
// were triggered
int _mainBufferSampleRate = audiolayer->getMainBuffer()->getInternalSamplingRate();
- // On-the-fly codec changing (normally, when we receive a full packet)
- // as per http://tools.ietf.org/id/draft-guy-iax-03.txt
- // - subclass holds the voiceformat property.
- if (event->subclass && event->subclass != call->getFormat()) {
- _debug("iaxHandleVoiceEvent: no format found in call setting it to %i\n", event->subclass);
- call->setFormat (event->subclass);
- }
+ // On-the-fly codec changing (normally, when we receive a full packet)
+ // as per http://tools.ietf.org/id/draft-guy-iax-03.txt
+ // - subclass holds the voiceformat property.
+ if (event->subclass && event->subclass != call->getFormat()) {
+ _debug("iaxHandleVoiceEvent: no format found in call setting it to %i\n", event->subclass);
+ call->setFormat (event->subclass);
+ }
- //_debug("Receive: len=%d, format=%d, _receiveDataDecoded=%p\n", event->datalen, call->getFormat(), _receiveDataDecoded);
- // ac = call->getCodecMap().getCodec (call -> getAudioCodec());
+ //_debug("Receive: len=%d, format=%d, _receiveDataDecoded=%p\n", event->datalen, call->getFormat(), _receiveDataDecoded);
+ // ac = call->getCodecMap().getCodec (call -> getAudioCodec());
- data = (unsigned char*) event->data;
+ data = (unsigned char*) event->data;
- size = event->datalen;
+ size = event->datalen;
- // Decode data with relevant codec
- max = (int) (ac->getClockRate() * audiolayer->getFrameSize() / 1000);
+ // Decode data with relevant codec
+ max = (int) (ac->getClockRate() * audiolayer->getFrameSize() / 1000);
- if (size > max) {
- _debug ("The size %d is bigger than expected %d. Packet cropped. Ouch!\n", size, max);
- size = max;
- }
+ if (size > max) {
+ _debug ("The size %d is bigger than expected %d. Packet cropped. Ouch!\n", size, max);
+ size = max;
+ }
- expandedSize = ac->codecDecode (spkrDataDecoded , data , size);
+ expandedSize = ac->codecDecode (spkrDataDecoded , data , size);
- nbInt16 = expandedSize/sizeof (int16);
+ nbInt16 = expandedSize/sizeof (int16);
- if (nbInt16 > max) {
- _debug ("We have decoded an IAX VOICE packet larger than expected: %i VS %i. Cropping.\n", nbInt16, max);
- nbInt16 = max;
- }
+ if (nbInt16 > max) {
+ _debug ("We have decoded an IAX VOICE packet larger than expected: %i VS %i. Cropping.\n", nbInt16, max);
+ nbInt16 = max;
+ }
- nbSample_ = nbInt16;
+ nbSample_ = nbInt16;
- // test if resampling is required
- if (ac->getClockRate() && (ac->getClockRate() != _mainBufferSampleRate)) {
+ // test if resampling is required
+ if (ac->getClockRate() && (ac->getClockRate() != _mainBufferSampleRate)) {
- // resample
- nbInt16 = converter->upsampleData (spkrDataDecoded, spkrDataConverted, ac->getClockRate(), _mainBufferSampleRate, nbSample_);
+ // resample
+ nbInt16 = converter->upsampleData (spkrDataDecoded, spkrDataConverted, ac->getClockRate(), _mainBufferSampleRate, nbSample_);
- /* Write the data to the mic ring buffer */
- audiolayer->getMainBuffer()->putData (spkrDataConverted, nbInt16 * sizeof (SFLDataFormat), 100, call->getCallId());
+ /* Write the data to the mic ring buffer */
+ audiolayer->getMainBuffer()->putData (spkrDataConverted, nbInt16 * sizeof (SFLDataFormat), 100, call->getCallId());
- } else {
+ } else {
- /* Write the data to the mic ring buffer */
- audiolayer->getMainBuffer()->putData (spkrDataDecoded, nbInt16 * sizeof (SFLDataFormat), 100, call->getCallId());
-
- }
+ /* Write the data to the mic ring buffer */
+ audiolayer->getMainBuffer()->putData (spkrDataDecoded, nbInt16 * sizeof (SFLDataFormat), 100, call->getCallId());
- } else {
- _debug ("IAX: incoming audio, but no sound card open");
- }
+ }
+
+ } else {
+ _debug ("IAX: incoming audio, but no sound card open");
+ }
}
/**
* Handle the registration process
*/
-void
+ void
IAXVoIPLink::iaxHandleRegReply (iax_event* event)
{
- std::string account_id;
- IAXAccount *account;
+ std::string account_id;
+ IAXAccount *account;
- account_id = getAccountID();
- account = dynamic_cast<IAXAccount *> (Manager::instance().getAccount (account_id));
+ account_id = getAccountID();
+ account = dynamic_cast<IAXAccount *> (Manager::instance().getAccount (account_id));
- if (event->etype == IAX_EVENT_REGREJ) {
- /* Authentication failed! */
- _mutexIAX.enterMutex();
- iax_destroy (_regSession);
- _mutexIAX.leaveMutex();
- _regSession = NULL;
- // Update the account registration state
- account->setRegistrationState (ErrorAuth);
- }
+ if (event->etype == IAX_EVENT_REGREJ) {
+ /* Authentication failed! */
+ _mutexIAX.enterMutex();
+ iax_destroy (_regSession);
+ _mutexIAX.leaveMutex();
+ _regSession = NULL;
+ // Update the account registration state
+ account->setRegistrationState (ErrorAuth);
+ }
- else if (event->etype == IAX_EVENT_REGACK) {
- /* Authentication succeeded */
- _mutexIAX.enterMutex();
-
- // Looking for the voicemail information
- //if( event->ies != 0 )
- //new_voicemails = processIAXMsgCount(event->ies.msgcount);
- //_debug("iax voicemail number notification: %i\n", new_voicemails);
- // Notify the client if new voicemail waiting for the current account
- //account_id = getAccountID();
- //Manager::instance().startVoiceMessageNotification(account_id.c_str(), new_voicemails);
-
- iax_destroy (_regSession);
- _mutexIAX.leaveMutex();
- _regSession = NULL;
-
- // I mean, save the timestamp, so that we re-register again in the REFRESH time.
- // Defaults to 60, as per draft-guy-iax-03.
- _nextRefreshStamp = time (NULL) + (event->ies.refresh ? event->ies.refresh : 60);
- account->setRegistrationState (Registered);
- }
+ else if (event->etype == IAX_EVENT_REGACK) {
+ /* Authentication succeeded */
+ _mutexIAX.enterMutex();
+
+ // Looking for the voicemail information
+ //if( event->ies != 0 )
+ //new_voicemails = processIAXMsgCount(event->ies.msgcount);
+ //_debug("iax voicemail number notification: %i\n", new_voicemails);
+ // Notify the client if new voicemail waiting for the current account
+ //account_id = getAccountID();
+ //Manager::instance().startVoiceMessageNotification(account_id.c_str(), new_voicemails);
+
+ iax_destroy (_regSession);
+ _mutexIAX.leaveMutex();
+ _regSession = NULL;
+
+ // I mean, save the timestamp, so that we re-register again in the REFRESH time.
+ // Defaults to 60, as per draft-guy-iax-03.
+ _nextRefreshStamp = time (NULL) + (event->ies.refresh ? event->ies.refresh : 60);
+ account->setRegistrationState (Registered);
+ }
}
int IAXVoIPLink::processIAXMsgCount (int msgcount)
{
- // IAX sends the message count under a specific format:
- // 1
- // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | 0x18 | 0x02 |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // | Old messages | New messages |
- // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ // IAX sends the message count under a specific format:
+ // 1
+ // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
+ // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ // | 0x18 | 0x02 |
+ // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ // | Old messages | New messages |
+ // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- // For now we just need the new messages informations.
- // Thus:
- // 0 <= msgcount <= 255 => msgcount new messages, 0 old messages
- // msgcount >= 256 => msgcount/256 old messages , msgcount%256 new messages (RULES)
+ // For now we just need the new messages informations.
+ // Thus:
+ // 0 <= msgcount <= 255 => msgcount new messages, 0 old messages
+ // msgcount >= 256 => msgcount/256 old messages , msgcount%256 new messages (RULES)
- return msgcount%256;
+ return msgcount%256;
}
-void
+ void
IAXVoIPLink::iaxHandlePrecallEvent (iax_event* event)
{
- IAXCall* call = NULL;
- CallID id;
- std::string reason = "Error ringing user.";
+ IAXCall* call = NULL;
+ CallID id;
+ std::string reason = "Error ringing user.";
- switch (event->etype) {
+ switch (event->etype) {
- case IAX_EVENT_REGACK:
+ case IAX_EVENT_REGACK:
- case IAX_EVENT_REGREJ:
- _debug ("IAX Registration Event in a pre-call setup\n");
- break;
+ case IAX_EVENT_REGREJ:
+ _debug ("IAX Registration Event in a pre-call setup\n");
+ break;
- case IAX_EVENT_REGREQ:
- // Received when someone wants to register to us!?!
- // Asterisk receives and answers to that, not us, we're a phone.
- _debug ("Registration by a peer, don't allow it\n");
- break;
+ case IAX_EVENT_REGREQ:
+ // Received when someone wants to register to us!?!
+ // Asterisk receives and answers to that, not us, we're a phone.
+ _debug ("Registration by a peer, don't allow it\n");
+ break;
- case IAX_EVENT_CONNECT:
- // We've got an incoming call! Yikes!
- _debug ("> IAX_EVENT_CONNECT (receive)\n");
+ case IAX_EVENT_CONNECT:
+ // We've got an incoming call! Yikes!
+ _debug ("> IAX_EVENT_CONNECT (receive)\n");
- id = Manager::instance().getNewCallID();
+ id = Manager::instance().getNewCallID();
- _debug("-------------------------------------------------------------- callid %s", id.c_str());
+ call = new IAXCall (id, Call::Incoming);
- call = new IAXCall (id, Call::Incoming);
+ if (!call) {
+ _debug ("! IAX Failure: unable to create an incoming call");
+ return;
+ }
- if (!call) {
- _debug ("! IAX Failure: unable to create an incoming call");
- return;
- }
+ // Setup the new IAXCall
+ // Associate the call to the session.
+ call->setSession (event->session);
- // Setup the new IAXCall
- // Associate the call to the session.
- call->setSession (event->session);
+ // setCallAudioLocal(call);
+ call->setCodecMap (Manager::instance().getCodecDescriptorMap());
- // setCallAudioLocal(call);
- call->setCodecMap (Manager::instance().getCodecDescriptorMap());
+ call->setConnectionState (Call::Progressing);
- call->setConnectionState (Call::Progressing);
+ if (event->ies.calling_number)
+ call->setPeerNumber (std::string (event->ies.calling_number));
- if (event->ies.calling_number)
- call->setPeerNumber (std::string (event->ies.calling_number));
+ if (event->ies.calling_name)
+ call->setPeerName (std::string (event->ies.calling_name));
- if (event->ies.calling_name)
- call->setPeerName (std::string (event->ies.calling_name));
+ // if peerNumber exist append it to the name string
+ call->initRecFileName();
- // if peerNumber exist append it to the name string
- call->initRecFileName();
+ if (Manager::instance().incomingCall (call, getAccountID())) {
+ /** @todo Faudra considérer éventuellement le champ CODEC PREFS pour
+ * l'établissement du codec de transmission */
- if (Manager::instance().incomingCall (call, getAccountID())) {
- /** @todo Faudra considérer éventuellement le champ CODEC PREFS pour
- * l'établissement du codec de transmission */
+ // Remote lists its capabilities
+ int format = call->getFirstMatchingFormat (event->ies.capability);
+ // Remote asks for preferred codec voiceformat
+ int pref_format = call->getFirstMatchingFormat (event->ies.format);
- // Remote lists its capabilities
- int format = call->getFirstMatchingFormat (event->ies.capability);
- // Remote asks for preferred codec voiceformat
- int pref_format = call->getFirstMatchingFormat (event->ies.format);
+ // Priority to remote's suggestion. In case it's a forwarding, no transcoding
+ // will be needed from the server, thus less latency.
- // Priority to remote's suggestion. In case it's a forwarding, no transcoding
- // will be needed from the server, thus less latency.
+ if (pref_format)
+ format = pref_format;
- if (pref_format)
- format = pref_format;
+ iax_accept (event->session, format);
- iax_accept (event->session, format);
+ iax_ring_announce (event->session);
- iax_ring_announce (event->session);
+ addCall (call);
- addCall (call);
- } else {
- // reject call, unable to add it
- iax_reject (event->session, (char*) reason.c_str());
+ // Set the audio codec now, to avoid non-set codec problem later
+ call->setFormat (format);
- delete call;
- call = NULL;
- }
+ } else {
+ // reject call, unable to add it
+ iax_reject (event->session, (char*) reason.c_str());
- break;
+ delete call;
+ call = NULL;
+ }
- case IAX_EVENT_HANGUP:
- // Remote peer hung up
- call = iaxFindCallBySession (event->session);
- id = call->getCallId();
- _debug ("IAXVoIPLink::hungup::iaxHandlePrecallEvent");
- Manager::instance().peerHungupCall (id);
- // terminateOneCall(id);
- removeCall (id);
- break;
+ break;
- case IAX_EVENT_TIMEOUT: // timeout for an unknown session
+ case IAX_EVENT_HANGUP:
+ // Remote peer hung up
+ call = iaxFindCallBySession (event->session);
+ id = call->getCallId();
+ _debug ("IAXVoIPLink::hungup::iaxHandlePrecallEvent");
+ Manager::instance().peerHungupCall (id);
+ // terminateOneCall(id);
+ removeCall (id);
+ break;
- break;
+ case IAX_EVENT_TIMEOUT: // timeout for an unknown session
- case IAX_IE_MSGCOUNT:
- //_debug("messssssssssssssssssssssssssssssssssssssssssssssssages\n");
- break;
+ break;
- default:
- _debug ("IAXVoIPLink::iaxHandlePrecallEvent: Unknown event type (in precall): %d\n", event->etype);
- }
+ case IAX_IE_MSGCOUNT:
+ //_debug("messssssssssssssssssssssssssssssssssssssssssssssssages\n");
+ break;
+
+ default:
+ _debug ("IAXVoIPLink::iaxHandlePrecallEvent: Unknown event type (in precall): %d\n", event->etype);
+ }
}
void IAXVoIPLink::updateAudiolayer (void)
{
- _mutexIAX.enterMutex();
- audiolayer = NULL;
- audiolayer = Manager::instance().getAudioDriver();
- _mutexIAX.leaveMutex();
+ _mutexIAX.enterMutex();
+ audiolayer = NULL;
+ audiolayer = Manager::instance().getAudioDriver();
+ _mutexIAX.leaveMutex();
}
diff --git a/sflphone-common/src/iax/iaxvoiplink.h b/sflphone-common/src/iax/iaxvoiplink.h
index a7771c782d901bdf52664fd4b2d2836caee08734..d67ef72b3e3302a6801127f5bafd8f69607ca28a 100644
--- a/sflphone-common/src/iax/iaxvoiplink.h
+++ b/sflphone-common/src/iax/iaxvoiplink.h
@@ -298,6 +298,9 @@ class IAXVoIPLink : public VoIPLink
/* URL hook */
UrlHook *urlhook;
+
+ /** Counter for IncomingCallNotification */
+ int countTime;
};
#endif
diff --git a/sflphone-common/src/main.cpp b/sflphone-common/src/main.cpp
index 8de4f43532a81f419b9717a569bc79844057cad3..48975876a924eabe49f52ac1f72d0047d3c52de5 100644
--- a/sflphone-common/src/main.cpp
+++ b/sflphone-common/src/main.cpp
@@ -60,19 +60,20 @@ main (int argc, char **argv)
unsigned int iPid = getpid();
char cPid[64], cOldPid[64];
sprintf (cPid,"%d", iPid);
- std::string xdg_config, xdg_env, path;
+ std::string xdg_cache, xdg_env, path;
- xdg_config = std::string (HOMEDIR) + DIR_SEPARATOR_STR + ".cache/sflphone";
+ xdg_cache = std::string (HOMEDIR) + DIR_SEPARATOR_STR + ".cache/";
if (XDG_CACHE_HOME != NULL) {
xdg_env = std::string (XDG_CACHE_HOME);
(xdg_env.length() > 0) ? path = xdg_env
- : path = xdg_config;
+ : path = xdg_cache;
} else
- path = xdg_config;
+ path = xdg_cache;
sprintf (sfldir, "%s", path.c_str ());
+ path = path + "sflphone";
sprintf (homepid, "%s/%s", path.c_str (), PIDFILE);
if ( (fp = fopen (homepid,"r")) == NULL) {
@@ -87,6 +88,16 @@ main (int argc, char **argv)
}
}
+ // Then create the sflphone directory inside the $XDG_CACHE_HOME dir
+ sprintf (sfldir, "%s", path.c_str ());
+ if ( (dir = opendir (sfldir)) == NULL) {
+ //Create it
+ if (mkdir (sfldir, 0755) != 0) {
+ fprintf (stderr, "Creating directory %s failed. Exited.\n", sfldir);
+ exit (-1);
+ }
+ }
+
// PID file doesn't exists, create and write pid in it
if ( (fp = fopen (homepid,"w")) == NULL) {
fprintf (stderr, "Creating PID file %s failed. Exited.\n", homepid);
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index d55b83c58567160e43cf8629973630a684b16445..8f97e00fd3c015008992a669d523890825f6114f 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -86,9 +86,9 @@ ManagerImpl::ManagerImpl (void)
, _callAccountMapMutex()
, _callConfigMap()
, _accountMap()
+ , _directIpAccount (NULL)
, _cleaner (NULL)
, _history (NULL)
- , _directIpAccount (NULL)
{
// initialize random generator for call id
@@ -189,7 +189,7 @@ ManagerImpl::isCurrentCall (const CallID& callId)
bool
ManagerImpl::hasCurrentCall()
{
- _debug ("ManagerImpl::hasCurrentCall current call ID = %s\n", _currentCallId2.c_str());
+ // _debug ("ManagerImpl::hasCurrentCall current call ID = %s\n", _currentCallId2.c_str());
if (_currentCallId2 != "") {
return true;
@@ -208,7 +208,7 @@ void
ManagerImpl::switchCall (const CallID& id)
{
ost::MutexLock m (_currentCallMutex);
- _debug("----- Switch current call id to %s -----\n", id.c_str());
+ _debug ("----- Switch current call id to %s -----\n", id.c_str());
_currentCallId2 = id;
/*
@@ -216,30 +216,30 @@ ManagerImpl::switchCall (const CallID& id)
if (id != "") {
- if(isConference(id)) {
+ if(isConference(id)) {
- Conference *conf;
+ Conference *conf;
- ConferenceMap::iterator iter = _conferencemap.find(id);
- if(iter != _conferencemap.end())
- {
- _debug(" set call recordable in audio layer\n");
- conf = iter->second;
- al->setRecorderInstance((Recordable*)conf);
- }
- }
- else {
+ ConferenceMap::iterator iter = _conferencemap.find(id);
+ if(iter != _conferencemap.end())
+ {
+ _debug(" set call recordable in audio layer\n");
+ conf = iter->second;
+ al->setRecorderInstance((Recordable*)conf);
+ }
+ }
+ else {
- // set the recordable instance in audiolayer
- AccountID account_id = getAccountFromCall(id);
-
+ // set the recordable instance in audiolayer
+ AccountID account_id = getAccountFromCall(id);
- Call *call = NULL;
- call = getAccountLink (account_id)->getCall(id);
- _debug(" set call recordable in audio layer\n");
- al->setRecorderInstance((Recordable*)call);
- }
+ Call *call = NULL;
+ call = getAccountLink (account_id)->getCall(id);
+
+ _debug(" set call recordable in audio layer\n");
+ al->setRecorderInstance((Recordable*)call);
+ }
}
*/
}
@@ -265,7 +265,7 @@ ManagerImpl::outgoingCall (const std::string& account_id, const CallID& call_id,
_cleaner->set_phone_number_prefix (getConfigString (HOOKS, PHONE_NUMBER_HOOK_ADD_PREFIX));
else
_cleaner->set_phone_number_prefix ("");
-
+
to_cleaned = _cleaner->clean (to);
/* Check what kind of call we are dealing with */
@@ -273,20 +273,18 @@ ManagerImpl::outgoingCall (const std::string& account_id, const CallID& call_id,
// in any cases we have to detach from current communication
if (hasCurrentCall()) {
-
- _debug (" outgoingCall: Has current call (%s) put it onhold\n", current_call_id.c_str());
-
- // if this is not a conferenceand this and is not a conference participant
- if (!isConference(current_call_id) && !participToConference(current_call_id))
- {
- _debug (" outgoingCall: Put the current call (%s) on hold\n", current_call_id.c_str());
- onHoldCall (current_call_id);
- }
- else if (isConference(current_call_id) && !participToConference(call_id))
- {
- _debug (" outgoingCall: detach main participant from conference\n");
- detachParticipant(default_id, current_call_id);
- }
+
+ _debug (" outgoingCall: Has current call (%s) put it onhold\n", current_call_id.c_str());
+
+ // if this is not a conferenceand this and is not a conference participant
+
+ if (!isConference (current_call_id) && !participToConference (current_call_id)) {
+ _debug (" outgoingCall: Put the current call (%s) on hold\n", current_call_id.c_str());
+ onHoldCall (current_call_id);
+ } else if (isConference (current_call_id) && !participToConference (call_id)) {
+ _debug (" outgoingCall: detach main participant from conference\n");
+ detachParticipant (default_id, current_call_id);
+ }
}
if (callConfig == Call::IPtoIP) {
@@ -335,7 +333,7 @@ bool
ManagerImpl::answerCall (const CallID& call_id)
{
- _debug("ManagerImpl::answerCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::answerCall(%s)\n", call_id.c_str());
stopTone (true);
@@ -343,32 +341,35 @@ ManagerImpl::answerCall (const CallID& call_id)
CallID current_call_id = getCurrentCallId();
AccountID account_id = getAccountFromCall (call_id);
- if(account_id == AccountNULL) {
- _debug(" answerCall: AccountId is null\n");
+
+ if (account_id == AccountNULL) {
+ _debug (" answerCall: AccountId is null\n");
}
-
+
Call* call = NULL;
+
call = getAccountLink (account_id)->getCall (call_id);
+
if (call == NULL) {
- _debug(" answerCall: Call is null\n");
+ _debug (" answerCall: Call is null\n");
}
// in any cases we have to detach from current communication
if (hasCurrentCall()) {
-
- _debug (" answerCall: Currently conversing with %s\n", current_call_id.c_str());
- // if it is not a conference and is not a conference participant
- if (!isConference(current_call_id) && !participToConference(current_call_id))
- {
- _debug (" answerCall: Put the current call (%s) on hold\n", current_call_id.c_str());
- onHoldCall (current_call_id);
- }
- // if we are talking to a conference and we are answering an incoming call
- else if (isConference(current_call_id) && !participToConference(call_id))
- {
- _debug (" answerCall: Detach main participant from conference\n");
- detachParticipant(default_id, current_call_id);
- }
+
+ _debug (" answerCall: Currently conversing with %s\n", current_call_id.c_str());
+ // if it is not a conference and is not a conference participant
+
+ if (!isConference (current_call_id) && !participToConference (current_call_id)) {
+ _debug (" answerCall: Put the current call (%s) on hold\n", current_call_id.c_str());
+ onHoldCall (current_call_id);
+ }
+
+ // if we are talking to a conference and we are answering an incoming call
+ else if (isConference (current_call_id) && !participToConference (call_id)) {
+ _debug (" answerCall: Detach main participant from conference\n");
+ detachParticipant (default_id, current_call_id);
+ }
}
@@ -382,25 +383,23 @@ ManagerImpl::answerCall (const CallID& call_id)
// if it was waiting, it's waiting no more
if (_dbus) _dbus->getCallManager()->callStateChanged (call_id, "CURRENT");
- std::string codecName = Manager::instance().getCurrentCodecName (call_id);
- if (_dbus) _dbus->getCallManager()->currentSelectedCodec (call_id, codecName.c_str());
-
+ // std::string codecName = Manager::instance().getCurrentCodecName (call_id);
+ // if (_dbus) _dbus->getCallManager()->currentSelectedCodec (call_id, codecName.c_str());
+
removeWaitingCall (call_id);
// if we dragged this call into a conference already
- if ( participToConference(call_id) ) {
-
- // AccountID currentAccountId;
+ if (participToConference (call_id)) {
+
+ // AccountID currentAccountId;
// Call* call = NULL;
- // currentAccountId = getAccountFromCall (call_id);
- // call = getAccountLink (currentAccountId)->getCall (call_id);
-
- switchCall(call->getConfId());
- }
- else
- {
- switchCall(call_id);
+ // currentAccountId = getAccountFromCall (call_id);
+ // call = getAccountLink (currentAccountId)->getCall (call_id);
+
+ switchCall (call->getConfId());
+ } else {
+ switchCall (call_id);
}
return true;
@@ -423,52 +422,47 @@ ManagerImpl::hangupCall (const CallID& call_id)
// switchCall (call_id);
/* Broadcast a signal over DBus */
- _debug(" hangupCall: Send DBUS call state change (HUNGUP) for id %s\n", call_id.c_str());
+ _debug (" hangupCall: Send DBUS call state change (HUNGUP) for id %s\n", call_id.c_str());
+
if (_dbus) _dbus->getCallManager()->callStateChanged (call_id, "HUNGUP");
int nbCalls = getCallList().size();
- // _debug("nbCalls: %i\n", nbCalls);
-
audiolayer = getAudioDriver();
// stop streams
- if (nbCalls <= 1)
- {
- _debug(" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
+ if (audiolayer && (nbCalls <= 1)) {
+ _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
audiolayer->stopStream();
}
-
- if(participToConference(call_id))
- {
- Conference *conf = getConferenceFromCallID(call_id);
- if(conf != NULL)
- {
- // remove this participant
- removeParticipant(call_id);
+ if (participToConference (call_id)) {
- processRemainingParticipant(current_call_id, conf);
- }
- }
- else
- {
- // we are not participating to a conference, current call switched to ""
- if (!isConference(current_call_id))
- switchCall("");
+ Conference *conf = getConferenceFromCallID (call_id);
+
+ if (conf != NULL) {
+ // remove this participant
+ removeParticipant (call_id);
+
+ processRemainingParticipant (current_call_id, conf);
+ }
+ } else {
+ // we are not participating to a conference, current call switched to ""
+ if (!isConference (current_call_id))
+ switchCall ("");
}
/* Direct IP to IP call */
if (getConfigFromCall (call_id) == Call::IPtoIP) {
returnValue = SIPVoIPLink::instance (AccountNULL)->hangup (call_id);
}
+
/* Classic call, attached to an account */
else {
account_id = getAccountFromCall (call_id);
- if (account_id == AccountNULL)
- {
+ if (account_id == AccountNULL) {
_debug ("! Manager Hangup Call: Call doesn't exists\n");
return false;
}
@@ -478,10 +472,8 @@ ManagerImpl::hangupCall (const CallID& call_id)
removeCallAccount (call_id);
}
- if (_audiodriver->getLayerType() == PULSEAUDIO && getConfigInt (PREFERENCES , CONFIG_PA_VOLUME_CTRL)) {
+ if (_audiodriver->getLayerType() == PULSEAUDIO) {
pulselayer = dynamic_cast<PulseLayer *> (getAudioDriver());
-
- if (pulselayer) pulselayer->restorePulseAppsVolume();
}
return returnValue;
@@ -494,29 +486,27 @@ ManagerImpl::hangupConference (const ConfID& id)
_debug ("ManagerImpl::hangupConference()\n");
Conference *conf;
- ConferenceMap::iterator iter_conf = _conferencemap.find(id);
+ ConferenceMap::iterator iter_conf = _conferencemap.find (id);
AccountID currentAccountId;
// Call* call = NULL;
-
- if(iter_conf != _conferencemap.end())
- {
- conf = iter_conf->second;
-
- ParticipantSet participants = conf->getParticipantList();
- ParticipantSet::iterator iter_participant = participants.begin();
- while(iter_participant != participants.end())
- {
- _debug("ManagerImpl::hangupConference participant %s\n", (*iter_participant).c_str());
+ if (iter_conf != _conferencemap.end()) {
+ conf = iter_conf->second;
- hangupCall (*iter_participant);
+ ParticipantSet participants = conf->getParticipantList();
+ ParticipantSet::iterator iter_participant = participants.begin();
- iter_participant++;
+ while (iter_participant != participants.end()) {
+ _debug ("ManagerImpl::hangupConference participant %s\n", (*iter_participant).c_str());
- }
+ hangupCall (*iter_participant);
+
+ iter_participant++;
+
+ }
}
@@ -570,37 +560,39 @@ ManagerImpl::onHoldCall (const CallID& call_id)
AccountID account_id;
bool returnValue;
- _debug("ManagerImpl::onHoldCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::onHoldCall(%s)\n", call_id.c_str());
stopTone (true);
-
+
CallID current_call_id = getCurrentCallId();
- _debug(" onHoldCall: try to put call %s on hold\n", call_id.c_str());
+ _debug (" onHoldCall: try to put call %s on hold\n", call_id.c_str());
/* Direct IP to IP call */
+
if (getConfigFromCall (call_id) == Call::IPtoIP) {
- returnValue = SIPVoIPLink::instance (AccountNULL)-> onhold (call_id);
+ returnValue = SIPVoIPLink::instance (AccountNULL)-> onhold (call_id);
}
/* Classic call, attached to an account */
else {
- account_id = getAccountFromCall (call_id);
-
- if (account_id == AccountNULL) {
- _debug (" onHoldCall: Account ID %s or callid %s doesn't exists\n", account_id.c_str(), call_id.c_str());
- return false;
- }
+ account_id = getAccountFromCall (call_id);
- returnValue = getAccountLink (account_id)->onhold (call_id);
+ if (account_id == AccountNULL) {
+ _debug (" onHoldCall: Account ID %s or callid %s doesn't exists\n", account_id.c_str(), call_id.c_str());
+ return false;
+ }
+
+ returnValue = getAccountLink (account_id)->onhold (call_id);
}
removeWaitingCall (call_id);
// keeps current call id if the action is not holding this call or a new outgoing call
- if(current_call_id == call_id) {
- switchCall ("");
+ if (current_call_id == call_id) {
+
+ switchCall ("");
}
if (_dbus) _dbus->getCallManager()->callStateChanged (call_id, "HOLD");
@@ -626,22 +618,19 @@ ManagerImpl::offHoldCall (const CallID& call_id)
CallID current_call_id = getCurrentCallId();
//Place current call on hold if it isn't
- if (hasCurrentCall())
- {
- // if this is not a conferenceand this and is not a conference participant
- if (!isConference(current_call_id) && !participToConference(current_call_id))
- {
- _debug (" offHoldCall: put current call (%s) on hold\n", current_call_id.c_str());
- onHoldCall (current_call_id);
- }
- else if (isConference(current_call_id) && !participToConference(call_id))
- {
- _debug (" offHoldCall Put current conference (%s) on hold\n", current_call_id.c_str());
- detachParticipant(default_id, current_call_id);
- }
+
+ if (hasCurrentCall()) {
+ // if this is not a conferenceand this and is not a conference participant
+ if (!isConference (current_call_id) && !participToConference (current_call_id)) {
+ _debug (" offHoldCall: put current call (%s) on hold\n", current_call_id.c_str());
+ onHoldCall (current_call_id);
+ } else if (isConference (current_call_id) && !participToConference (call_id)) {
+ _debug (" offHoldCall Put current conference (%s) on hold\n", current_call_id.c_str());
+ detachParticipant (default_id, current_call_id);
+ }
}
- // switch current call id to id since sipvoip link need it to amke a call
+ // switch current call id to id since sipvoip link need it to amke a call
// switchCall(id);
/* Direct IP to IP call */
@@ -661,7 +650,7 @@ ManagerImpl::offHoldCall (const CallID& call_id)
_debug ("Setting OFFHOLD, Account %s, callid %s\n", account_id.c_str(), call_id.c_str());
- is_rec = getAccountLink (account_id)->getCall(call_id)->isRecording();
+ is_rec = getAccountLink (account_id)->getCall (call_id)->isRecording();
returnValue = getAccountLink (account_id)->offhold (call_id);
}
@@ -674,29 +663,27 @@ ManagerImpl::offHoldCall (const CallID& call_id)
}
- if ( participToConference(call_id) ) {
-
- AccountID currentAccountId;
+ if (participToConference (call_id)) {
+
+ AccountID currentAccountId;
Call* call = NULL;
- currentAccountId = getAccountFromCall (call_id);
- call = getAccountLink (currentAccountId)->getCall (call_id);
-
- switchCall(call->getConfId());
-
- }
- else
- {
- switchCall(call_id);
- _audiodriver->getMainBuffer()->flush(default_id);
+ currentAccountId = getAccountFromCall (call_id);
+ call = getAccountLink (currentAccountId)->getCall (call_id);
+
+ switchCall (call->getConfId());
+
+ } else {
+ switchCall (call_id);
+ _audiodriver->flushMain();
}
- codecName = getCurrentCodecName (call_id);
+
+ // codecName = getCurrentCodecName (call_id);
// _debug("ManagerImpl::hangupCall(): broadcast codec name %s \n",codecName.c_str());
- if (_dbus) _dbus->getCallManager()->currentSelectedCodec (call_id,codecName.c_str());
+ // if (_dbus) _dbus->getCallManager()->currentSelectedCodec (call_id,codecName.c_str());
-
return returnValue;
}
@@ -734,24 +721,20 @@ ManagerImpl::transferCall (const CallID& call_id, const std::string& to)
removeWaitingCall (call_id);
- if(participToConference(call_id))
- {
+ if (participToConference (call_id)) {
- Conference *conf = getConferenceFromCallID(call_id);
+ Conference *conf = getConferenceFromCallID (call_id);
- if(conf != NULL)
- {
- // remove this participant
- removeParticipant(call_id);
+ if (conf != NULL) {
+ // remove this participant
+ removeParticipant (call_id);
- processRemainingParticipant(current_call_id, conf);
- }
- }
- else
- {
- // we are not participating to a conference, current call switched to ""
- if (!isConference(current_call_id))
- switchCall("");
+ processRemainingParticipant (current_call_id, conf);
+ }
+ } else {
+ // we are not participating to a conference, current call switched to ""
+ if (!isConference (current_call_id))
+ switchCall ("");
}
if (_dbus) _dbus->getCallManager()->callStateChanged (call_id, "HUNGUP");
@@ -778,19 +761,20 @@ ManagerImpl::refuseCall (const CallID& id)
AccountID accountid;
bool returnValue;
+ CallID current_call_id = getCurrentCallId();
+
stopTone (false);
int nbCalls = getCallList().size();
// AudioLayer* audiolayer = getAudioDriver();
-
- if (nbCalls <= 1)
- {
- _debug(" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
-
- AudioLayer* audiolayer = getAudioDriver();
- audiolayer->stopStream();
+
+ if (nbCalls <= 1) {
+ _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
+
+ AudioLayer* audiolayer = getAudioDriver();
+ audiolayer->stopStream();
}
/* Direct IP to IP call */
@@ -820,90 +804,94 @@ ManagerImpl::refuseCall (const CallID& id)
if (_dbus) _dbus->getCallManager()->callStateChanged (id, "HUNGUP");
- switchCall ("");
+ // if(current_call_id.compare("") != 0)
+ // switchCall ("");
}
-
+
return returnValue;
}
Conference*
-ManagerImpl::createConference(const CallID& id1, const CallID& id2)
+ManagerImpl::createConference (const CallID& id1, const CallID& id2)
{
- _debug("ManagerImpl::createConference()\n");
-
+ _debug ("ManagerImpl::createConference()\n");
+
Conference* conf = new Conference();
// _conferencecall.insert(pair<CallID, Conference*>(id1, conf));
// _conferencecall.insert(pair<CallID, Conference*>(id2, conf));
- _conferencemap.insert(pair<CallID, Conference*>(conf->getConfID(), conf));
+ _conferencemap.insert (pair<CallID, Conference*> (conf->getConfID(), conf));
- conf->add(id1);
- conf->add(id2);
+ conf->add (id1);
+ conf->add (id2);
// broadcast a signal over dbus
- _dbus->getCallManager()->conferenceCreated(conf->getConfID());
-
+ _dbus->getCallManager()->conferenceCreated (conf->getConfID());
+
return conf;
}
void
-ManagerImpl::removeConference(const ConfID& conference_id)
+ManagerImpl::removeConference (const ConfID& conference_id)
{
- _debug("ManagerImpl::removeConference(%s)\n", conference_id.c_str());
+ _debug ("ManagerImpl::removeConference(%s)\n", conference_id.c_str());
Conference* conf = NULL;
- _debug(" removeConference: _conferencemap.size: %i\n", _conferencemap.size());
- ConferenceMap::iterator iter = _conferencemap.find(conference_id);
+ _debug (" removeConference: _conferencemap.size: %i\n", (int) _conferencemap.size());
+ ConferenceMap::iterator iter = _conferencemap.find (conference_id);
if (iter != _conferencemap.end()) {
- _debug(" removeConference: Found conference id %s in conferencemap\n", conference_id.c_str());
+ _debug (" removeConference: Found conference id %s in conferencemap\n", conference_id.c_str());
conf = iter->second;
}
- if(conf == NULL) {
+ if (conf == NULL) {
- _debug(" removeConference: Error conference not found\n");
- return;
+ _debug (" removeConference: Error conference not found\n");
+ return;
}
// We now need to bind the audio to the remain participant
// unbind main participant from conference (just to be sure)
- _audiodriver->getMainBuffer()->unBindAll(default_id);
+ _audiodriver->getMainBuffer()->unBindAll (default_id);
ParticipantSet participants = conf->getParticipantList();
// bind main participant to remaining conference call
ParticipantSet::iterator iter_p = participants.begin();
+
if (iter_p != participants.end()) {
- // to avoid puting onhold the call
- // switchCall("");
- _audiodriver->getMainBuffer()->bindCallID(*iter_p, default_id);
+ // to avoid puting onhold the call
+ // switchCall("");
+ _audiodriver->getMainBuffer()->bindCallID (*iter_p, default_id);
}
-
+
// Then remove the conference from the conference map
- _debug("ManagerImpl:: remove conference %s\n", conference_id.c_str());
- if (_conferencemap.erase(conference_id) == 1)
- _debug("ManagerImpl:: conference %s removed succesfully\n", conference_id.c_str());
+ _debug ("ManagerImpl:: remove conference %s\n", conference_id.c_str());
+
+ if (_conferencemap.erase (conference_id) == 1)
+ _debug ("ManagerImpl:: conference %s removed succesfully\n", conference_id.c_str());
else
- _debug("ManagerImpl:: error cannot remove conference id: %s\n", conference_id.c_str());
+ _debug ("ManagerImpl:: error cannot remove conference id: %s\n", conference_id.c_str());
// broadcast a signal over dbus
- _debug("ManagerImpl::removeConference broadcast call removed on dbus: %s\n", conference_id.c_str());
- _dbus->getCallManager()->conferenceRemoved(conference_id);
+ _debug ("ManagerImpl::removeConference broadcast call removed on dbus: %s\n", conference_id.c_str());
+
+ _dbus->getCallManager()->conferenceRemoved (conference_id);
}
Conference*
-ManagerImpl::getConferenceFromCallID(const CallID& call_id)
+ManagerImpl::getConferenceFromCallID (const CallID& call_id)
{
AccountID account_id;
Call* call = NULL;
@@ -911,115 +899,109 @@ ManagerImpl::getConferenceFromCallID(const CallID& call_id)
account_id = getAccountFromCall (call_id);
call = getAccountLink (account_id)->getCall (call_id);
- ConferenceMap::iterator iter = _conferencemap.find(call->getConfId());
- if(iter != _conferencemap.end())
- {
- return iter->second;
- }
- else
- {
- return NULL;
+ ConferenceMap::iterator iter = _conferencemap.find (call->getConfId());
+
+ if (iter != _conferencemap.end()) {
+ return iter->second;
+ } else {
+ return NULL;
}
}
void
-ManagerImpl::holdConference(const CallID& id)
+ManagerImpl::holdConference (const CallID& id)
{
_debug ("ManagerImpl::holdConference()\n");
Conference *conf;
- ConferenceMap::iterator iter_conf = _conferencemap.find(id);
+ ConferenceMap::iterator iter_conf = _conferencemap.find (id);
AccountID currentAccountId;
Call* call = NULL;
- if(iter_conf != _conferencemap.end())
- {
- conf = iter_conf->second;
+ if (iter_conf != _conferencemap.end()) {
+ conf = iter_conf->second;
- ParticipantSet participants = conf->getParticipantList();
- ParticipantSet::iterator iter_participant = participants.begin();
+ ParticipantSet participants = conf->getParticipantList();
+ ParticipantSet::iterator iter_participant = participants.begin();
- while(iter_participant != participants.end())
- {
- _debug(" holdConference: participant %s\n", (*iter_participant).c_str());
- currentAccountId = getAccountFromCall (*iter_participant);
- call = getAccountLink (currentAccountId)->getCall (*iter_participant);
+ while (iter_participant != participants.end()) {
+ _debug (" holdConference: participant %s\n", (*iter_participant).c_str());
+ currentAccountId = getAccountFromCall (*iter_participant);
+ call = getAccountLink (currentAccountId)->getCall (*iter_participant);
- switchCall(*iter_participant);
- onHoldCall(*iter_participant);
+ switchCall (*iter_participant);
+ onHoldCall (*iter_participant);
- iter_participant++;
+ iter_participant++;
- }
+ }
- conf->setState(Conference::Hold);
+ conf->setState (Conference::Hold);
- _dbus->getCallManager()->conferenceChanged(conf->getConfID(), conf->getStateStr());
+ _dbus->getCallManager()->conferenceChanged (conf->getConfID(), conf->getStateStr());
}
-
-
+
+
}
void
-ManagerImpl::unHoldConference(const CallID& id)
+ManagerImpl::unHoldConference (const CallID& id)
{
_debug ("ManagerImpl::unHoldConference()\n");
Conference *conf;
- ConferenceMap::iterator iter_conf = _conferencemap.find(id);
+ ConferenceMap::iterator iter_conf = _conferencemap.find (id);
AccountID currentAccountId;
Call* call = NULL;
- if(iter_conf != _conferencemap.end())
- {
- conf = iter_conf->second;
-
- ParticipantSet participants = conf->getParticipantList();
- ParticipantSet::iterator iter_participant = participants.begin();
+ if (iter_conf != _conferencemap.end()) {
+ conf = iter_conf->second;
- while(iter_participant != participants.end())
- {
- _debug(" unholdConference: participant %s\n", (*iter_participant).c_str());
- currentAccountId = getAccountFromCall (*iter_participant);
- call = getAccountLink (currentAccountId)->getCall (*iter_participant);
+ ParticipantSet participants = conf->getParticipantList();
+ ParticipantSet::iterator iter_participant = participants.begin();
- offHoldCall(*iter_participant);
+ while (iter_participant != participants.end()) {
+ _debug (" unholdConference: participant %s\n", (*iter_participant).c_str());
+ currentAccountId = getAccountFromCall (*iter_participant);
+ call = getAccountLink (currentAccountId)->getCall (*iter_participant);
- iter_participant++;
+ offHoldCall (*iter_participant);
- }
+ iter_participant++;
- conf->setState(Conference::Active_Atached);
+ }
- _dbus->getCallManager()->conferenceChanged(conf->getConfID(), conf->getStateStr());
+ conf->setState (Conference::Active_Atached);
+
+ _dbus->getCallManager()->conferenceChanged (conf->getConfID(), conf->getStateStr());
}
}
bool
-ManagerImpl::isConference(const CallID& id)
+ManagerImpl::isConference (const CallID& id)
{
- ConferenceMap::iterator iter = _conferencemap.find(id);
- if(iter == _conferencemap.end()) {
- return false;
- }
- else {
- return true;
+ ConferenceMap::iterator iter = _conferencemap.find (id);
+
+ if (iter == _conferencemap.end()) {
+ return false;
+ } else {
+ return true;
}
}
bool
-ManagerImpl::participToConference(const CallID& call_id)
+ManagerImpl::participToConference (const CallID& call_id)
{
AccountID accountId;
@@ -1027,185 +1009,164 @@ ManagerImpl::participToConference(const CallID& call_id)
Call* call = NULL;
accountId = getAccountFromCall (call_id);
- call = getAccountLink (accountId)->getCall(call_id);
+ call = getAccountLink (accountId)->getCall (call_id);
if (call == NULL)
- return false;
+ return false;
- if(call->getConfId() == "") {
- return false;
- }
- else {
- return true;
+ if (call->getConfId() == "") {
+ return false;
+ } else {
+ return true;
}
}
void
-ManagerImpl::addParticipant(const CallID& call_id, const CallID& conference_id)
+ManagerImpl::addParticipant (const CallID& call_id, const CallID& conference_id)
{
- _debug("ManagerImpl::addParticipant(%s, %s)\n", call_id.c_str(), conference_id.c_str());
+ _debug ("ManagerImpl::addParticipant(%s, %s)\n", call_id.c_str(), conference_id.c_str());
- std::map<std::string, std::string> call_details = getCallDetails(call_id);
+ std::map<std::string, std::string> call_details = getCallDetails (call_id);
- ConferenceMap::iterator iter = _conferencemap.find(conference_id);
+ ConferenceMap::iterator iter = _conferencemap.find (conference_id);
std::map<std::string, std::string>::iterator iter_details;
// store the current call id (it will change in offHoldCall or in answerCall)
CallID current_call_id = getCurrentCallId();
- // detach from the conference and switch to this conference
- if (current_call_id != call_id)
- {
- if (isConference(current_call_id)) {
- detachParticipant(default_id, current_call_id);
- }
- else
- onHoldCall(current_call_id);
+ // detach from the conference and switch to this conference
+
+ if (current_call_id != call_id) {
+ if (isConference (current_call_id)) {
+ detachParticipant (default_id, current_call_id);
+ } else
+ onHoldCall (current_call_id);
}
- // TODO: remove this ugly hack => There should be different calls when double clicking
- // a conference to add main participant to it, or (in this case) adding a participant
- // toconference
- switchCall("");
- addMainParticipant(conference_id);
+ // TODO: remove this ugly hack => There should be different calls when double clicking
+ // a conference to add main participant to it, or (in this case) adding a participant
+ // toconference
+ switchCall ("");
+
+ addMainParticipant (conference_id);
- _debug(" addParticipant: enter main process\n");
- if(iter != _conferencemap.end()) {
+ _debug (" addParticipant: enter main process\n");
- Conference* conf = iter->second;
- switchCall(conf->getConfID());
+ if (iter != _conferencemap.end()) {
+
+ Conference* conf = iter->second;
+ switchCall (conf->getConfID());
- AccountID currentAccountId;
+ AccountID currentAccountId;
Call* call = NULL;
- currentAccountId = getAccountFromCall (call_id);
- call = getAccountLink (currentAccountId)->getCall (call_id);
- call->setConfId (conf->getConfID());
+ currentAccountId = getAccountFromCall (call_id);
+ call = getAccountLink (currentAccountId)->getCall (call_id);
+ call->setConfId (conf->getConfID());
- conf->add(call_id);
-
- iter_details = call_details.find("CALL_STATE");
+ conf->add (call_id);
- _debug(" addParticipant: call state: %s\n", iter_details->second.c_str());
- if (iter_details->second == "HOLD")
- {
- _debug(" OFFHOLD %s\n", call_id.c_str());
+ iter_details = call_details.find ("CALL_STATE");
- // offHoldCall create a new rtp session which use addStream to bind participant
- offHoldCall(call_id);
- }
- else if(iter_details->second == "INCOMING")
- {
- _debug(" ANSWER %s\n", call_id.c_str());
- // answerCall create a new rtp session which use addStream to bind participant
- answerCall(call_id);
- }
- else if(iter_details->second == "CURRENT")
- {
- // Already a curent call, so we beed to reset audio stream bindings manually
- _audiodriver->getMainBuffer()->unBindAll(call_id);
- conf->bindParticipant(call_id);
- }
+ _debug (" addParticipant: call state: %s\n", iter_details->second.c_str());
- // _dbus->getCallManager()->conferenceChanged(conference_id, conf->getStateStr());
+ if (iter_details->second == "HOLD") {
+ _debug (" OFFHOLD %s\n", call_id.c_str());
- ParticipantSet participants = conf->getParticipantList();
- // reset ring buffer for all conference participant
- ParticipantSet::iterator iter_p = participants.begin();
- while(iter_p != participants.end()) {
+ // offHoldCall create a new rtp session which use addStream to bind participant
+ offHoldCall (call_id);
+ } else if (iter_details->second == "INCOMING") {
+ _debug (" ANSWER %s\n", call_id.c_str());
+ // answerCall create a new rtp session which use addStream to bind participant
+ answerCall (call_id);
+ } else if (iter_details->second == "CURRENT") {
+ // Already a curent call, so we beed to reset audio stream bindings manually
+ _audiodriver->getMainBuffer()->unBindAll (call_id);
+ conf->bindParticipant (call_id);
+ }
- // to avoid puting onhold the call
- // switchCall("");
- _audiodriver->getMainBuffer()->flush(*iter_p);
+ // _dbus->getCallManager()->conferenceChanged(conference_id, conf->getStateStr());
- iter_p++;
- }
+ ParticipantSet participants = conf->getParticipantList();
- _audiodriver->getMainBuffer()->flush(default_id);
- }
- else
- {
- _debug(" addParticipant: Error, conference %s conference_id not found!\n", conference_id.c_str());
- }
+ // reset ring buffer for all conference participant
+ ParticipantSet::iterator iter_p = participants.begin();
+ while (iter_p != participants.end()) {
- // bind main participant to conference after adding new participant
- // detachParticipant(default_id, current_call_id);
+ // flush conference participants only
+ _audiodriver->getMainBuffer()->flush (*iter_p);
- // to avoid puting onhold the added call
- // switchCall("");
- // addMainParticipant(conference_id);
+ iter_p++;
+ }
+
+ _audiodriver->getMainBuffer()->flush (default_id);
+ } else {
+ _debug (" addParticipant: Error, conference %s conference_id not found!\n", conference_id.c_str());
+ }
- // _dbus->getCallManager()->conferenceChanged(conference_id, conference_id);
-
-
}
void
-ManagerImpl::addMainParticipant(const CallID& conference_id)
-{
- if(hasCurrentCall())
- {
- CallID current_call_id = getCurrentCallId();
-
- if(isConference(current_call_id))
- {
- detachParticipant(default_id, current_call_id);
- }
- else
- {
- onHoldCall(current_call_id);
- }
+ManagerImpl::addMainParticipant (const CallID& conference_id)
+{
+ if (hasCurrentCall()) {
+ CallID current_call_id = getCurrentCallId();
+
+ if (isConference (current_call_id)) {
+ detachParticipant (default_id, current_call_id);
+ } else {
+ onHoldCall (current_call_id);
+ }
}
- ConferenceMap::iterator iter = _conferencemap.find(conference_id);
+ ConferenceMap::iterator iter = _conferencemap.find (conference_id);
Conference *conf = NULL;
- if(iter != _conferencemap.end())
- {
- conf = iter->second;
+ if (iter != _conferencemap.end()) {
+ conf = iter->second;
- ParticipantSet participants = conf->getParticipantList();
+ ParticipantSet participants = conf->getParticipantList();
- ParticipantSet::iterator iter_participant = participants.begin();
- while(iter_participant != participants.end())
- {
- _audiodriver->getMainBuffer()->bindCallID(*iter_participant, default_id);
-
- iter_participant++;
- }
+ ParticipantSet::iterator iter_participant = participants.begin();
- // Reset ringbuffer's readpointers
- iter_participant = participants.begin();
- while(iter_participant != participants.end())
- {
- _audiodriver->getMainBuffer()->flush(*iter_participant);
-
- iter_participant++;
- }
+ while (iter_participant != participants.end()) {
+ _audiodriver->getMainBuffer()->bindCallID (*iter_participant, default_id);
+
+ iter_participant++;
+ }
- _audiodriver->getMainBuffer()->flush(default_id);
+ // Reset ringbuffer's readpointers
+ iter_participant = participants.begin();
+
+ while (iter_participant != participants.end()) {
+ _audiodriver->getMainBuffer()->flush (*iter_participant);
+
+ iter_participant++;
+ }
- conf->setState(Conference::Active_Atached);
+ _audiodriver->getMainBuffer()->flush (default_id);
+
+ conf->setState (Conference::Active_Atached);
+
+ _dbus->getCallManager()->conferenceChanged (conference_id, conf->getStateStr());
- _dbus->getCallManager()->conferenceChanged(conference_id, conf->getStateStr());
-
}
- switchCall(conference_id);
+ switchCall (conference_id);
}
void
-ManagerImpl::joinParticipant(const CallID& call_id1, const CallID& call_id2)
+ManagerImpl::joinParticipant (const CallID& call_id1, const CallID& call_id2)
{
- _debug("ManagerImpl::joinParticipant(%s, %s)\n", call_id1.c_str(), call_id2.c_str());
+ _debug ("ManagerImpl::joinParticipant(%s, %s)\n", call_id1.c_str(), call_id2.c_str());
// _debug(" Current call ID %s\n", getCurrentCallId().c_str());
- std::map<std::string, std::string> call1_details = getCallDetails(call_id1);
- std::map<std::string, std::string> call2_details = getCallDetails(call_id2);
+ std::map<std::string, std::string> call1_details = getCallDetails (call_id1);
+ std::map<std::string, std::string> call2_details = getCallDetails (call_id2);
std::map<std::string, std::string>::iterator iter_details;
@@ -1213,157 +1174,154 @@ ManagerImpl::joinParticipant(const CallID& call_id1, const CallID& call_id2)
Call* call = NULL;
CallID current_call_id = getCurrentCallId();
- _debug(" joinParticipant: current_call_id %s\n", current_call_id.c_str());
+ _debug (" joinParticipant: current_call_id %s\n", current_call_id.c_str());
+
+ // detach from the conference and switch to this conference
- // detach from the conference and switch to this conference
- if ((current_call_id != call_id1) && (current_call_id != call_id2))
- {
- if (isConference(current_call_id))
- detachParticipant(default_id, current_call_id);
- else
- onHoldCall(current_call_id);
+ if ( (current_call_id != call_id1) && (current_call_id != call_id2)) {
+ if (isConference (current_call_id))
+ detachParticipant (default_id, current_call_id);
+ else
+ onHoldCall (current_call_id);
}
- _debug(" joinParticipant: create a conference\n");
+ _debug (" joinParticipant: create a conference\n");
- Conference *conf = createConference(call_id1, call_id2);
- switchCall(conf->getConfID());
+ Conference *conf = createConference (call_id1, call_id2);
+ switchCall (conf->getConfID());
currentAccountId = getAccountFromCall (call_id1);
call = getAccountLink (currentAccountId)->getCall (call_id1);
call->setConfId (conf->getConfID());
-
- iter_details = call1_details.find("CALL_STATE");
- _debug(" joinParticipant: call1 %s state: %s\n", call_id1.c_str(), iter_details->second.c_str());
- if (iter_details->second == "HOLD")
- {
- _debug(" OFFHOLD %s\n", call_id1.c_str());
- offHoldCall(call_id1);
- }
- else if(iter_details->second == "INCOMING")
- {
- _debug(" ANSWER %s\n", call_id1.c_str());
- answerCall(call_id1);
- }
- else if(iter_details->second == "CURRENT")
- {
- _debug(" CURRENT %s\n", call_id1.c_str());
- _audiodriver->getMainBuffer()->unBindAll(call_id1);
- conf->bindParticipant(call_id1);
+
+ iter_details = call1_details.find ("CALL_STATE");
+ _debug (" joinParticipant: call1 %s state: %s\n", call_id1.c_str(), iter_details->second.c_str());
+
+ if (iter_details->second == "HOLD") {
+ _debug (" OFFHOLD %s\n", call_id1.c_str());
+ offHoldCall (call_id1);
+ } else if (iter_details->second == "INCOMING") {
+ _debug (" ANSWER %s\n", call_id1.c_str());
+ answerCall (call_id1);
+ } else if (iter_details->second == "CURRENT") {
+ _debug (" CURRENT %s\n", call_id1.c_str());
+ _audiodriver->getMainBuffer()->unBindAll (call_id1);
+ conf->bindParticipant (call_id1);
+ } else if (iter_details->second == "INACTIVE") {
+ _debug (" INACTIVE %s\n", call_id1.c_str());
+ answerCall (call_id1);
+ } else {
+ _debug (" CAll State not recognized\n");
}
currentAccountId = getAccountFromCall (call_id2);
+
call = getAccountLink (currentAccountId)->getCall (call_id2);
call->setConfId (conf->getConfID());
-
- iter_details = call2_details.find("CALL_STATE");
- _debug(" joinParticipant: call2 %s state: %s\n", call_id2.c_str(), iter_details->second.c_str());
- if (iter_details->second == "HOLD")
- {
- _debug(" OFFHOLD %s\n", call_id2.c_str());
- offHoldCall (call_id2);
- }
- else if(iter_details->second == "INCOMING")
- {
- _debug(" ANSWER %s\n", call_id2.c_str());
- answerCall(call_id2);
- }
- else if(iter_details->second == "CURRENT")
- {
- _debug(" CURRENT %s\n", call_id2.c_str());
- _audiodriver->getMainBuffer()->unBindAll(call_id2);
- conf->bindParticipant(call_id2);
+
+ iter_details = call2_details.find ("CALL_STATE");
+ _debug (" joinParticipant: call2 %s state: %s\n", call_id2.c_str(), iter_details->second.c_str());
+
+ if (iter_details->second == "HOLD") {
+ _debug (" OFFHOLD %s\n", call_id2.c_str());
+ offHoldCall (call_id2);
+ } else if (iter_details->second == "INCOMING") {
+ _debug (" ANSWER %s\n", call_id2.c_str());
+ answerCall (call_id2);
+ } else if (iter_details->second == "CURRENT") {
+ _debug (" CURRENT %s\n", call_id2.c_str());
+ _audiodriver->getMainBuffer()->unBindAll (call_id2);
+ conf->bindParticipant (call_id2);
+ } else if (iter_details->second == "INACTIVE") {
+ _debug (" INACTIVE %s\n", call_id2.c_str());
+ answerCall (call_id2);
+ } else {
+ _debug (" CAll State not recognized\n");
}
// finally bind main participant to conference
// addMainParticipant(default_conf);
-
-
+
+
// switchCall(conf->getConfID());
}
void
-ManagerImpl::detachParticipant(const CallID& call_id, const CallID& current_id)
+ManagerImpl::detachParticipant (const CallID& call_id, const CallID& current_id)
{
- _debug("ManagerImpl::detachParticipant(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::detachParticipant(%s)\n", call_id.c_str());
CallID current_call_id = current_id;
-
- if(current_call_id.compare("") == 0);
- current_call_id = getCurrentCallId();
- if(call_id != default_id)
- {
- AccountID currentAccountId;
- Call* call = NULL;
+ if (current_call_id.compare ("") == 0);
- currentAccountId = getAccountFromCall (call_id);
- call = getAccountLink (currentAccountId)->getCall (call_id);
+ current_call_id = getCurrentCallId();
- // TODO: add conference_id as a second parameter
- ConferenceMap::iterator iter = _conferencemap.find(call->getConfId());
+ if (call_id != default_id) {
+ AccountID currentAccountId;
+ Call* call = NULL;
- Conference *conf = getConferenceFromCallID(call_id);
+ currentAccountId = getAccountFromCall (call_id);
+ call = getAccountLink (currentAccountId)->getCall (call_id);
- if(conf != NULL) {
+ // TODO: add conference_id as a second parameter
+ ConferenceMap::iterator iter = _conferencemap.find (call->getConfId());
- _debug(" detachParticipant: detaching participant %s\n", call_id.c_str());
+ Conference *conf = getConferenceFromCallID (call_id);
- std::map<std::string, std::string> call_details = getCallDetails(call_id);
- std::map<std::string, std::string>::iterator iter_details;
+ if (conf != NULL) {
- iter_details = call_details.find("CALL_STATE");
- if (iter_details->second == "RINGING")
- {
- removeParticipant(call_id);
- }
- else
- {
- _debug(" ONHOLD %s\n", call_id.c_str());
- onHoldCall(call_id);
+ _debug (" detachParticipant: detaching participant %s\n", call_id.c_str());
- removeParticipant(call_id);
+ std::map<std::string, std::string> call_details = getCallDetails (call_id);
+ std::map<std::string, std::string>::iterator iter_details;
- processRemainingParticipant(current_call_id, conf);
- }
- }
- else {
-
+ iter_details = call_details.find ("CALL_STATE");
+
+ if (iter_details->second == "RINGING") {
+ removeParticipant (call_id);
+ } else {
+ _debug (" ONHOLD %s\n", call_id.c_str());
+ onHoldCall (call_id);
+
+ removeParticipant (call_id);
+
+ processRemainingParticipant (current_call_id, conf);
+ }
+ } else {
+
+
+ _debug (" detachParticipant: call is not conferencing, cannot detach\n");
- _debug(" detachParticipant: call is not conferencing, cannot detach\n");
-
}
- }
- else
- {
- _debug(" detachParticipant: unbind main participant from all\n");
- _audiodriver->getMainBuffer()->unBindAll(default_id);
+ } else {
+ _debug (" detachParticipant: unbind main participant from all\n");
+ _audiodriver->getMainBuffer()->unBindAll (default_id);
- if( isConference(current_call_id) )
- {
+ if (isConference (current_call_id)) {
- ConferenceMap::iterator iter = _conferencemap.find(current_call_id);
- Conference *conf = iter->second;
+ ConferenceMap::iterator iter = _conferencemap.find (current_call_id);
+ Conference *conf = iter->second;
- conf->setState(Conference::Active_Detached);
+ conf->setState (Conference::Active_Detached);
- _dbus->getCallManager()->conferenceChanged(conf->getConfID(), conf->getStateStr());
- }
+ _dbus->getCallManager()->conferenceChanged (conf->getConfID(), conf->getStateStr());
+ }
+
+ switchCall ("");
- switchCall("");
-
}
-
+
}
void
-ManagerImpl::removeParticipant(const CallID& call_id)
+ManagerImpl::removeParticipant (const CallID& call_id)
{
- _debug("ManagerImpl::removeParticipant(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::removeParticipant(%s)\n", call_id.c_str());
// TODO: add conference_id as a second parameter
Conference* conf;
@@ -1376,18 +1334,17 @@ ManagerImpl::removeParticipant(const CallID& call_id)
call = getAccountLink (currentAccountId)->getCall (call_id);
ConferenceMap conf_map = _conferencemap;
- ConferenceMap::iterator iter = conf_map.find(call->getConfId());
+ ConferenceMap::iterator iter = conf_map.find (call->getConfId());
- if(iter == conf_map.end()) {
- _debug(" no conference created, cannot remove participant \n");
- }
- else {
+ if (iter == conf_map.end()) {
+ _debug (" no conference created, cannot remove participant \n");
+ } else {
- conf = iter->second;
+ conf = iter->second;
- _debug(" removeParticipant %s\n", call_id.c_str());
- conf->remove(call_id);
- call->setConfId ("");
+ _debug (" removeParticipant %s\n", call_id.c_str());
+ conf->remove (call_id);
+ call->setConfId ("");
}
@@ -1395,107 +1352,100 @@ ManagerImpl::removeParticipant(const CallID& call_id)
void
-ManagerImpl::processRemainingParticipant(CallID current_call_id, Conference *conf)
+ManagerImpl::processRemainingParticipant (CallID current_call_id, Conference *conf)
{
- _debug("ManagerImpl::processRemainingParticipant()\n");
+ _debug ("ManagerImpl::processRemainingParticipant()\n");
- if(conf->getNbParticipants() > 1)
- {
+ if (conf->getNbParticipants() > 1) {
- ParticipantSet participants = conf->getParticipantList();
- ParticipantSet::iterator iter_participant = participants.begin();
+ ParticipantSet participants = conf->getParticipantList();
+ ParticipantSet::iterator iter_participant = participants.begin();
- // Reset ringbuffer's readpointers
- iter_participant = participants.begin();
- while(iter_participant != participants.end())
- {
- _audiodriver->getMainBuffer()->flush(*iter_participant);
-
- iter_participant++;
- }
+ // Reset ringbuffer's readpointers
+ iter_participant = participants.begin();
- _audiodriver->getMainBuffer()->flush(default_id);
-
- }
- else if (conf->getNbParticipants() == 1)
- {
- AccountID currentAccountId;
- Call* call = NULL;
-
- ParticipantSet participants = conf->getParticipantList();
- ParticipantSet::iterator iter_participant = participants.begin();
-
- // bind main participant to remaining conference call
- if (iter_participant != participants.end()) {
-
- // this call is no more a conference participant
- currentAccountId = getAccountFromCall (*iter_participant);
- call = getAccountLink (currentAccountId)->getCall (*iter_participant);
- call->setConfId ("");
-
- // if we are not listening to this conference
- if (current_call_id != conf->getConfID())
- {
- onHoldCall(call->getCallId());
- }
- else
- {
- switchCall(*iter_participant);
- }
- }
-
- removeConference(conf->getConfID());
- }
- else
- {
- removeConference(conf->getConfID());
-
- switchCall("");
+ while (iter_participant != participants.end()) {
+ _audiodriver->getMainBuffer()->flush (*iter_participant);
+
+ iter_participant++;
+ }
+
+ _audiodriver->getMainBuffer()->flush (default_id);
+
+ } else if (conf->getNbParticipants() == 1) {
+ AccountID currentAccountId;
+ Call* call = NULL;
+
+ ParticipantSet participants = conf->getParticipantList();
+ ParticipantSet::iterator iter_participant = participants.begin();
+
+ // bind main participant to remaining conference call
+
+ if (iter_participant != participants.end()) {
+
+ // this call is no more a conference participant
+ currentAccountId = getAccountFromCall (*iter_participant);
+ call = getAccountLink (currentAccountId)->getCall (*iter_participant);
+ call->setConfId ("");
+
+ // if we are not listening to this conference
+
+ if (current_call_id != conf->getConfID()) {
+ onHoldCall (call->getCallId());
+ } else {
+ switchCall (*iter_participant);
+ }
+ }
+
+ removeConference (conf->getConfID());
+ } else {
+ removeConference (conf->getConfID());
+
+ switchCall ("");
}
}
void
-ManagerImpl::joinConference(const CallID& conf_id1, const CallID& conf_id2)
+ManagerImpl::joinConference (const CallID& conf_id1, const CallID& conf_id2)
{
- _debug("ManagerImpl::joinConference(%s, %s)\n", conf_id1.c_str(), conf_id2.c_str());
-
+ _debug ("ManagerImpl::joinConference(%s, %s)\n", conf_id1.c_str(), conf_id2.c_str());
+
ConferenceMap::iterator iter;
Conference *conf1 = NULL;
Conference *conf2 = NULL;
- iter = _conferencemap.find(conf_id1);
-
- if(iter != _conferencemap.end())
- conf1 = iter->second;
+ iter = _conferencemap.find (conf_id1);
+
+ if (iter != _conferencemap.end())
+ conf1 = iter->second;
- iter = _conferencemap.find(conf_id2);
+ iter = _conferencemap.find (conf_id2);
- if(iter != _conferencemap.end())
- conf2 = iter->second;
+ if (iter != _conferencemap.end())
+ conf2 = iter->second;
ParticipantSet participants = conf1->getParticipantList();
ParticipantSet::iterator iter_participant = participants.begin();
- while(iter_participant != participants.end())
- {
- detachParticipant(*iter_participant, "");
- addParticipant(*iter_participant, conf_id2);
+ while (iter_participant != participants.end()) {
+ detachParticipant (*iter_participant, "");
+ addParticipant (*iter_participant, conf_id2);
- iter_participant++;
+ iter_participant++;
}
// detachParticipant(default_id, "");
-
+
}
void
-ManagerImpl::addStream(const CallID& call_id)
+ManagerImpl::addStream (const CallID& call_id)
{
- _debug("ManagerImpl::addStream %s\n", call_id.c_str());
+ _debug ("ManagerImpl::addStream %s\n", call_id.c_str());
AccountID currentAccountId;
Call* call = NULL;
@@ -1503,57 +1453,59 @@ ManagerImpl::addStream(const CallID& call_id)
currentAccountId = getAccountFromCall (call_id);
call = getAccountLink (currentAccountId)->getCall (call_id);
- if(participToConference(call_id)) {
+ if (participToConference (call_id)) {
- // bind to conference participant
- ConferenceMap::iterator iter = _conferencemap.find(call->getConfId());
+ // bind to conference participant
+ ConferenceMap::iterator iter = _conferencemap.find (call->getConfId());
- if (iter != _conferencemap.end())
- {
- Conference* conf = iter->second;
+ if (iter != _conferencemap.end()) {
+ Conference* conf = iter->second;
- _debug(" addStream: bind call %s to conference %s\n", call_id.c_str(), conf->getConfID().c_str());
+ _debug (" addStream: bind call %s to conference %s\n", call_id.c_str(), conf->getConfID().c_str());
- conf->bindParticipant(call_id);
+ conf->bindParticipant (call_id);
- ParticipantSet participants = conf->getParticipantList();
- // reset ring buffer for all conference participant
- ParticipantSet::iterator iter_p = participants.begin();
- while(iter_p != participants.end()) {
+ ParticipantSet participants = conf->getParticipantList();
+ // reset ring buffer for all conference participant
+ ParticipantSet::iterator iter_p = participants.begin();
- // to avoid puting onhold the call
- // switchCall("");
- _audiodriver->getMainBuffer()->flush(*iter_p);
-
- iter_p++;
- }
+ while (iter_p != participants.end()) {
- _audiodriver->getMainBuffer()->flush(default_id);
- }
-
- }
- else {
+ // to avoid puting onhold the call
+ // switchCall("");
+ _audiodriver->getMainBuffer()->flush (*iter_p);
- _debug(" addStream: bind call %s to main\n", call_id.c_str());
+ iter_p++;
+ }
- // bind to main
- getAudioDriver()->getMainBuffer()->bindCallID(call_id);
+ _audiodriver->getMainBuffer()->flush (default_id);
+ }
+
+ } else {
+
+ _debug (" addStream: bind call %s to main\n", call_id.c_str());
+
+ // bind to main
+ getAudioDriver()->getMainBuffer()->bindCallID (call_id);
+
+ // _audiodriver->getMainBuffer()->flush(default_id);
+ _audiodriver->flushUrgent();
+ _audiodriver->flushMain();
- _audiodriver->getMainBuffer()->flush(default_id);
}
}
void
-ManagerImpl::removeStream(const CallID& call_id)
+ManagerImpl::removeStream (const CallID& call_id)
{
- _debug("ManagerImpl::removeStream %s\n", call_id.c_str());
+ _debug ("ManagerImpl::removeStream %s\n", call_id.c_str());
- getAudioDriver()->getMainBuffer()->unBindAll(call_id);
+ getAudioDriver()->getMainBuffer()->unBindAll (call_id);
- if(participToConference(call_id)) {
- removeParticipant(call_id);
+ if (participToConference (call_id)) {
+ removeParticipant (call_id);
}
-
+
}
//THREAD=Main
@@ -1651,24 +1603,22 @@ ManagerImpl::playDtmf (char code, bool isTalking)
AudioLayer *audiolayer;
SFLDataFormat *buf;
- _debug("ManagerImpl::playDtmf\n");
+ _debug ("ManagerImpl::playDtmf\n");
stopTone (false);
bool hasToPlayTone = getConfigBool (SIGNALISATION, PLAY_DTMF);
- if (!hasToPlayTone)
- {
- _debug(" playDtmf: Do not have to play a tone...\n");
+ if (!hasToPlayTone) {
+ _debug (" playDtmf: Do not have to play a tone...\n");
return false;
}
// length in milliseconds
pulselen = getConfigInt (SIGNALISATION, PULSE_LENGTH);
- if (!pulselen)
- {
- _debug(" playDtmf: Pulse length is not set...\n");
+ if (!pulselen) {
+ _debug (" playDtmf: Pulse length is not set...\n");
return false;
}
@@ -1679,9 +1629,8 @@ ManagerImpl::playDtmf (char code, bool isTalking)
layer = audiolayer->getLayerType();
// fast return, no sound, so no dtmf
- if (audiolayer==0 || _dtmfKey == 0)
- {
- _debug(" playDtmf: Error no audio layer...\n");
+ if (audiolayer==0 || _dtmfKey == 0) {
+ _debug (" playDtmf: Error no audio layer...\n");
return false;
}
@@ -1689,10 +1638,11 @@ ManagerImpl::playDtmf (char code, bool isTalking)
// size (n sampling) = time_ms * sampling/s
// ---------------------
// ms/s
- size = (int) ((pulselen * (float) audiolayer->getSampleRate()) / 1000);
+ size = (int) ( (pulselen * (float) audiolayer->getSampleRate()) / 1000);
+
+ _debug ("DTMF pulselen: %i\n", pulselen);
- _debug("DTMF pulselen: %i\n", pulselen);
- _debug("DTMF size: %i\n", size);
+ _debug ("DTMF size: %i\n", size);
// this buffer is for mono
// TODO <-- this should be global and hide if same size
@@ -1706,12 +1656,11 @@ ManagerImpl::playDtmf (char code, bool isTalking)
// Put buffer to urgentRingBuffer
// put the size in bytes...
// so size * 1 channel (mono) * sizeof (bytes for the data)
- // audiolayer->flushUrgent();
- audiolayer->startStream();
- audiolayer->putUrgent (buf, size * sizeof (SFLDataFormat));
- }
- else {
- _debug(" playDtmf: Error cannot play dtmf\n");
+ // audiolayer->flushUrgent();
+ audiolayer->startStream();
+ audiolayer->putUrgent (buf, size * sizeof (SFLDataFormat));
+ } else {
+ _debug (" playDtmf: Error cannot play dtmf\n");
}
ret = true;
@@ -1772,18 +1721,36 @@ ManagerImpl::incomingCall (Call* call, const AccountID& accountId)
PulseLayer *pulselayer;
std::string from, number, display_name, display;
- stopTone (true);
+ stopTone (false);
_debug ("Incoming call %s for account %s\n", call->getCallId().data(), accountId.c_str());
associateCallToAccount (call->getCallId(), accountId);
- if (accountId==AccountNULL)
+ // If account is null it is an ip to ip call
+ if (accountId==AccountNULL) {
+
associateConfigToCall (call->getCallId(), Call::IPtoIP);
+ }
+ else {
+ // strip sip: which is not required and bring confusion with ip to ip calls
+ // when placing new call from history (if call is IAX, do nothing)
+ std::string peerNumber = call->getPeerNumber();
+
+ int startIndex = peerNumber.find("sip:");
+
+ // if "sip:" is found => it is not an IAX call
+ if(startIndex != (int)string::npos) {
+ std::string strippedPeerNumber = peerNumber.substr(startIndex+4);
+ call->setPeerNumber(strippedPeerNumber);
+ }
+
+ }
_debug ("ManagerImpl::incomingCall :: hasCurrentCall() %i \n", hasCurrentCall());
if (!hasCurrentCall()) {
+
call->setConnectionState (Call::Ringing);
ringtone();
// switchCall (call->getCallId());
@@ -1826,24 +1793,21 @@ ManagerImpl::incomingCall (Call* call, const AccountID& accountId)
*/
/* Broadcast a signal over DBus */
- _debug(" From: %s, Number: %s, DisplayName: %s\n", from.c_str(), number.c_str(), display_name.c_str());
+ _debug ("From: %s, Number: %s, DisplayName: %s\n", from.c_str(), number.c_str(), display_name.c_str());
display = display_name;
- display.append(" ");
- display.append(from);
- _debug(" To be displayed: %s\n", display.c_str());
-
+ display.append (" ");
+
+ display.append (from);
+
if (_dbus) _dbus->getCallManager()->incomingCall (accountId, call->getCallId(), display.c_str());
//if (_dbus) _dbus->getCallManager()->callStateChanged(call->getCallId(), "INCOMING");
- // Reduce volume of the other pulseaudio-connected audio applications
- if (_audiodriver->getLayerType() == PULSEAUDIO && getConfigInt (PREFERENCES , CONFIG_PA_VOLUME_CTRL)) {
+ if (_audiodriver->getLayerType() == PULSEAUDIO) {
pulselayer = dynamic_cast<PulseLayer *> (getAudioDriver());
-
- if (pulselayer) pulselayer->reducePulseAppsVolume();
}
return true;
@@ -1862,18 +1826,22 @@ ManagerImpl::incomingMessage (const AccountID& accountId, const std::string& mes
void
ManagerImpl::peerAnsweredCall (const CallID& id)
{
+ // The if statement is usefull only if we sent two calls at the same time.
if (isCurrentCall (id)) {
stopTone (false);
}
if (_dbus) _dbus->getCallManager()->callStateChanged (id, "CURRENT");
- std::string codecName = getCurrentCodecName (id);
+ // std::string codecName = getCurrentCodecName (id);
// _debug("ManagerImpl::hangupCall(): broadcast codec name %s \n",codecName.c_str());
- if (_dbus) _dbus->getCallManager()->currentSelectedCodec (id,codecName.c_str());
+ // if (_dbus) _dbus->getCallManager()->currentSelectedCodec (id,codecName.c_str());
-
+ // Required if there have been no sip reinvite, in this case we must reinit buffers since the
+ _audiodriver->flushMain();
+
+ _audiodriver->flushUrgent();
}
//THREAD=VoIP Call=Outgoing
@@ -1895,44 +1863,39 @@ ManagerImpl::peerHungupCall (const CallID& call_id)
AccountID account_id;
bool returnValue;
- _debug("ManagerImpl::peerHungupCall(%s)\n", call_id.c_str());
+ _debug ("ManagerImpl::peerHungupCall(%s)\n", call_id.c_str());
// store the current call id
CallID current_call_id = getCurrentCallId();
- if(participToConference(call_id))
- {
+ if (participToConference (call_id)) {
- Conference *conf = getConferenceFromCallID(call_id);
+ Conference *conf = getConferenceFromCallID (call_id);
- if(conf != NULL)
- {
+ if (conf != NULL) {
- removeParticipant(call_id);
-
- processRemainingParticipant(current_call_id, conf);
- }
- }
- else
- {
- if (isCurrentCall(call_id))
- {
- stopTone (true);
-
- switchCall ("");
- }
+ removeParticipant (call_id);
+
+ processRemainingParticipant (current_call_id, conf);
+ }
+ } else {
+ if (isCurrentCall (call_id)) {
+ stopTone (true);
+
+ switchCall ("");
+ }
}
int nbCalls = getCallList().size();
// stop streams
- if (nbCalls <= 1)
- {
- _debug(" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
-
- AudioLayer* audiolayer = getAudioDriver();
- audiolayer->stopStream();
+
+ if (nbCalls <= 1) {
+ _debug (" hangupCall: stop audio stream, ther is only %i call(s) remaining\n", nbCalls);
+
+ AudioLayer* audiolayer = getAudioDriver();
+ audiolayer->stopStream();
}
/* Direct IP to IP call */
@@ -1959,10 +1922,8 @@ ManagerImpl::peerHungupCall (const CallID& call_id)
removeCallAccount (call_id);
- if (_audiodriver->getLayerType() == PULSEAUDIO && getConfigInt (PREFERENCES , CONFIG_PA_VOLUME_CTRL)) {
+ if (_audiodriver->getLayerType() == PULSEAUDIO) {
pulselayer = dynamic_cast<PulseLayer *> (getAudioDriver());
-
- if (pulselayer) pulselayer->restorePulseAppsVolume();
}
}
@@ -2023,11 +1984,11 @@ void ManagerImpl::connectionStatusNotification()
bool ManagerImpl::playATone (Tone::TONEID toneId)
{
bool hasToPlayTone;
- AudioLoop *audioloop;
+ // AudioLoop *audioloop;
AudioLayer *audiolayer;
- unsigned int nbSamples;
+ // unsigned int nbSamples;
- _debug("ManagerImpl::playATone\n");
+ _debug ("ManagerImpl::playATone\n");
hasToPlayTone = getConfigBool (SIGNALISATION, PLAY_TONES);
@@ -2036,26 +1997,28 @@ bool ManagerImpl::playATone (Tone::TONEID toneId)
audiolayer = getAudioDriver();
-
+
if (audiolayer) {
- audiolayer->flushUrgent();
- audiolayer->startStream();
+
+ audiolayer->flushUrgent();
+ audiolayer->startStream();
}
if (_telephoneTone != 0) {
_toneMutex.enterMutex();
_telephoneTone->setCurrentTone (toneId);
_toneMutex.leaveMutex();
+ /*
+ audioloop = getTelephoneTone();
+ nbSamples = audioloop->getSize();
+ SFLDataFormat buf[nbSamples];
- audioloop = getTelephoneTone();
- nbSamples = audioloop->getSize();
- SFLDataFormat buf[nbSamples];
-
- if (audiolayer) {
- audiolayer->putUrgent (buf, nbSamples);
- } else
- return false;
+ if (audiolayer) {
+ audiolayer->putUrgent (buf, nbSamples);
+ } else
+ return false;
+ */
}
return true;
@@ -2068,6 +2031,8 @@ void ManagerImpl::stopTone (bool stopAudio=true)
{
bool hasToPlayTone;
+ _debug ("ManagerImpl::stopTone\n");
+
hasToPlayTone = getConfigBool (SIGNALISATION, PLAY_TONES);
if (!hasToPlayTone)
@@ -2122,6 +2087,8 @@ ManagerImpl::congestion ()
void
ManagerImpl::ringback ()
{
+ _debug ("ManagerImpl::ringback\n");
+
playATone (Tone::TONE_RINGTONE);
}
@@ -2131,6 +2098,7 @@ ManagerImpl::ringback ()
void
ManagerImpl::ringtone()
{
+ _debug ("ManagerImpl::ringtone\n");
std::string ringchoice;
AudioLayer *audiolayer;
AudioCodec *codecForTone;
@@ -2140,6 +2108,8 @@ ManagerImpl::ringtone()
// stopTone(true);
if (isRingtoneEnabled()) {
+
+ _debug (" Tone is enabled\n");
//TODO Comment this because it makes the daemon crashes since the main thread
//synchronizes the ringtone thread.
@@ -2175,8 +2145,9 @@ ManagerImpl::ringtone()
_audiofile.start();
_toneMutex.leaveMutex();
+ // start audio if not started AND flush all buffers (main and urgent)
audiolayer->startStream();
-
+
} else {
ringback();
}
@@ -2219,7 +2190,7 @@ void ManagerImpl::notificationIncomingCall (void)
audiolayer = getAudioDriver();
- _debug("ManagerImpl::notificationIncomingCall\n");
+ _debug ("ManagerImpl::notificationIncomingCall\n");
if (audiolayer != 0) {
samplerate = audiolayer->getSampleRate();
@@ -2229,7 +2200,7 @@ void ManagerImpl::notificationIncomingCall (void)
SFLDataFormat buf[nbSampling];
tone.getNext (buf, tone.getSize());
/* Put the data in the urgent ring buffer */
- audiolayer->flushUrgent();
+ audiolayer->flushUrgent();
audiolayer->putUrgent (buf, sizeof (SFLDataFormat) *nbSampling);
}
}
@@ -2358,7 +2329,6 @@ ManagerImpl::initConfigFile (bool load_user_value, std::string alternate)
_config.addDefaultValue (std::pair<std::string, std::string> (CONFIG_HISTORY_LIMIT, DFT_HISTORY_LIMIT), PREFERENCES);
_config.addDefaultValue (std::pair<std::string, std::string> (CONFIG_HISTORY_ENABLED, TRUE_STR), PREFERENCES);
_config.addDefaultValue (std::pair<std::string, std::string> (CONFIG_AUDIO, DFT_AUDIO_MANAGER), PREFERENCES);
- _config.addDefaultValue (std::pair<std::string, std::string> (CONFIG_PA_VOLUME_CTRL, TRUE_STR), PREFERENCES);
_config.addDefaultValue (std::pair<std::string, std::string> (CONFIG_SIP_PORT, DFT_SIP_PORT), PREFERENCES);
_config.addDefaultValue (std::pair<std::string, std::string> (CONFIG_ACCOUNTS_ORDER, EMPTY_FIELD), PREFERENCES);
_config.addDefaultValue (std::pair<std::string, std::string> (CONFIG_MD5HASH, FALSE_STR), PREFERENCES);
@@ -2560,17 +2530,17 @@ std::string
ManagerImpl::getCurrentCodecName (const CallID& id)
{
- AccountID accountid = getAccountFromCall(id);
+ AccountID accountid = getAccountFromCall (id);
VoIPLink* link = getAccountLink (accountid);
- Call* call = link->getCall(id);
+ Call* call = link->getCall (id);
- if(!call)
- return "";
-
- if(call->getState() != Call::Active)
- return "";
+ if (!call)
+ return "";
+
+ if (call->getState() != Call::Active)
+ return "";
else
- return link->getCurrentCodecName();
+ return link->getCurrentCodecName();
}
/**
@@ -2686,7 +2656,7 @@ ManagerImpl::setAudioOutputDevice (const int index)
alsalayer = dynamic_cast<AlsaLayer*> (getAudioDriver ());
alsaplugin = alsalayer->getAudioPlugin ();
- _debug(" set output plugin: %s\n", alsaplugin.c_str());
+ _debug (" set output plugin: %s\n", alsaplugin.c_str());
_audiodriver->openDevice (_audiodriver->getIndexIn(), index, _audiodriver->getSampleRate(), _audiodriver->getFrameSize(), SFL_PCM_PLAYBACK, alsaplugin);
@@ -2731,7 +2701,7 @@ ManagerImpl::setAudioInputDevice (const int index)
alsalayer = dynamic_cast<AlsaLayer*> (getAudioDriver ());
alsaplugin = alsalayer->getAudioPlugin ();
- _debug(" set input plugin: %s\n", alsaplugin.c_str());
+ _debug (" set input plugin: %s\n", alsaplugin.c_str());
_audiodriver->openDevice (index, _audiodriver->getIndexOut(), _audiodriver->getSampleRate(), _audiodriver->getFrameSize(), SFL_PCM_CAPTURE, alsaplugin);
@@ -2868,7 +2838,7 @@ ManagerImpl::setRecordingCall (const CallID& id)
getAccountLink (accountid)->setRecording (id);
*/
AccountID accountid = getAccountFromCall (id);
- Recordable* rec = (Recordable*)getAccountLink (accountid)->getCall(id);
+ Recordable* rec = (Recordable*) getAccountLink (accountid)->getCall (id);
rec->setRecording();
}
@@ -2884,7 +2854,7 @@ ManagerImpl::isRecording (const CallID& id)
*/
AccountID accountid = getAccountFromCall (id);
- Recordable* rec = (Recordable*)getAccountLink (accountid)->getCall(id);
+ Recordable* rec = (Recordable*) getAccountLink (accountid)->getCall (id);
return rec->isRecording();
}
@@ -2963,18 +2933,6 @@ ManagerImpl::getMailNotify (void)
return getConfigInt (PREFERENCES, CONFIG_MAIL_NOTIFY);
}
-std::string
-ManagerImpl::getPulseAppVolumeControl (void)
-{
- return getConfigString (PREFERENCES , CONFIG_PA_VOLUME_CTRL);
-}
-
-void
-ManagerImpl::setPulseAppVolumeControl (void)
-{
- (getConfigString (PREFERENCES , CONFIG_PA_VOLUME_CTRL) == TRUE_STR) ? setConfig (PREFERENCES , CONFIG_PA_VOLUME_CTRL , FALSE_STR) : setConfig (PREFERENCES , CONFIG_PA_VOLUME_CTRL , TRUE_STR) ;
-}
-
void ManagerImpl::setAudioManager (const int32_t& api)
{
@@ -3071,15 +3029,15 @@ ManagerImpl::initAudioDriver (void)
if (getConfigInt (PREFERENCES , CONFIG_AUDIO) == ALSA) {
_audiodriver = new AlsaLayer (this);
- _audiodriver->setMainBuffer(&_mainBuffer);
+ _audiodriver->setMainBuffer (&_mainBuffer);
} else if (getConfigInt (PREFERENCES , CONFIG_AUDIO) == PULSEAUDIO) {
if (app_is_running ("pulseaudio") == 0) {
_audiodriver = new PulseLayer (this);
- _audiodriver->setMainBuffer(&_mainBuffer);
+ _audiodriver->setMainBuffer (&_mainBuffer);
} else {
_audiodriver = new AlsaLayer (this);
setConfig (PREFERENCES, CONFIG_AUDIO, ALSA);
- _audiodriver->setMainBuffer(&_mainBuffer);
+ _audiodriver->setMainBuffer (&_mainBuffer);
}
} else
_debug ("Error - Audio API unknown\n");
@@ -3188,18 +3146,18 @@ void ManagerImpl::switchAudioManager (void)
case ALSA:
_debug ("Creating Pulseaudio layer...\n");
_audiodriver = new PulseLayer (this);
- _audiodriver->setMainBuffer(&_mainBuffer);
+ _audiodriver->setMainBuffer (&_mainBuffer);
break;
case PULSEAUDIO:
_debug ("Creating ALSA layer...\n");
_audiodriver = new AlsaLayer (this);
- _audiodriver->setMainBuffer(&_mainBuffer);
+ _audiodriver->setMainBuffer (&_mainBuffer);
break;
default:
_debug ("Error: audio layer unknown\n");
- break;
+ break;
}
_audiodriver->setErrorMessage (-1);
@@ -3213,16 +3171,16 @@ void ManagerImpl::switchAudioManager (void)
_debug ("has current call: %i \n", hasCurrentCall());
- if(hasCurrentCall())
- _audiodriver->startStream();
-
+ if (hasCurrentCall())
+ _audiodriver->startStream();
+
// need to stop audio streams if there is currently no call
// if ( (type != PULSEAUDIO) && (!hasCurrentCall())) {
- // _debug("There is currently a call!!\n");
- // _audiodriver->stopStream();
+ // _debug("There is currently a call!!\n");
+ // _audiodriver->stopStream();
- // }
+ // }
}
/**
@@ -3332,7 +3290,8 @@ ManagerImpl::getCallStatus (const std::string& sequenceId UNUSED)
switch (call->getState()) {
case Call::Active:
- case Call::Conferencing:
+
+ case Call::Conferencing:
code="112";
status = "Established";
break;
@@ -3708,6 +3667,7 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
std::string authenticationName;
std::string password;
std::string realm;
+ std::string voicemail_count;
if ( (iter = map_cpy.find (AUTHENTICATION_USERNAME)) != map_cpy.end()) {
authenticationName = iter->second;
@@ -3724,9 +3684,8 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
if ( (iter = map_cpy.find (REALM)) != map_cpy.end()) {
realm = iter->second;
}
-
+
setConfig (accountID, REALM, realm);
-
setConfig (accountID, USERNAME, username);
setConfig (accountID, AUTHENTICATION_USERNAME, authenticationName);
@@ -3984,15 +3943,11 @@ void
ManagerImpl::sendRegister (const std::string& accountID , const int32_t& enable)
{
- _debug ("ManagerImpl::sendRegister \n");
-
// Update the active field
setConfig (accountID, CONFIG_ACCOUNT_ENABLE, (enable == 1) ? TRUE_STR:FALSE_STR);
- _debug ("ManagerImpl::sendRegister set config done\n");
Account* acc = getAccount (accountID);
acc->loadConfig();
- _debug ("ManagerImpl::sendRegister acc->loadconfig done\n");
// Test on the freshly updated value
@@ -4090,7 +4045,8 @@ ManagerImpl::removeAccount (const AccountID& accountID)
if (remAccount != NULL) {
remAccount->unregisterVoIPLink();
_accountMap.erase (accountID);
- delete remAccount;
+ // http://projects.savoirfairelinux.net/issues/show/2355
+ // delete remAccount;
}
_config.removeSection (accountID);
@@ -4100,6 +4056,7 @@ ManagerImpl::removeAccount (const AccountID& accountID)
_debug ("REMOVE ACCOUNT\n");
if (_dbus) _dbus->getConfigurationManager()->accountsChanged();
+
}
// ACCOUNT handling
@@ -4597,6 +4554,7 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails (const CallID&
call_details.insert (std::pair<std::string, std::string> ("ACCOUNTID", accountid));
call_details.insert (std::pair<std::string, std::string> ("PEER_NUMBER", call->getPeerNumber ()));
call_details.insert (std::pair<std::string, std::string> ("PEER_NAME", call->getPeerName ()));
+ call_details.insert (std::pair<std::string, std::string> ("DISPLAY_NAME", call->getDisplayName ()));
call_details.insert (std::pair<std::string, std::string> ("CALL_STATE", call->getStateStr ()));
call_details.insert (std::pair<std::string, std::string> ("CALL_TYPE", type.str ()));
} else {
@@ -4640,19 +4598,20 @@ ManagerImpl::getCallList (void)
}
-std::map< std::string, std::string >
-ManagerImpl::getConferenceDetails(const ConfID& confID)
+std::map< std::string, std::string >
+ManagerImpl::getConferenceDetails (const ConfID& confID)
{
std::map<std::string, std::string> conf_details;
ConferenceMap::iterator iter_conf;
- iter_conf = _conferencemap.find(confID);
+ iter_conf = _conferencemap.find (confID);
- Conference *conf = NULL;
- if(iter_conf != _conferencemap.end()) {
+ Conference* conf = NULL;
+
+ if (iter_conf != _conferencemap.end()) {
-
+ conf = iter_conf->second;
conf_details.insert (std::pair<std::string, std::string> ("CONFID", confID));
conf_details.insert (std::pair<std::string, std::string> ("CONF_STATE", conf->getStateStr()));
}
@@ -4664,10 +4623,11 @@ ManagerImpl::getConferenceDetails(const ConfID& confID)
std::vector< std::string >
ManagerImpl::getConferenceList (void)
{
- _debug("ManagerImpl::getConferenceList\n");
+ _debug ("ManagerImpl::getConferenceList\n");
std::vector< std::string > v;
ConferenceMap::iterator iter = _conferencemap.begin();
+
while (iter != _conferencemap.end ()) {
v.push_back (iter->first);
iter++;
@@ -4680,24 +4640,25 @@ ManagerImpl::getConferenceList (void)
std::vector< std::string >
ManagerImpl::getParticipantList (const std::string& confID)
{
- _debug("ManagerImpl::getParticipantList\n");
+ _debug ("ManagerImpl::getParticipantList\n");
std::vector< std::string > v;
- ConferenceMap::iterator iter_conf = _conferencemap.find(confID);
+ ConferenceMap::iterator iter_conf = _conferencemap.find (confID);
Conference *conf = NULL;
- if(iter_conf != _conferencemap.end())
+
+ if (iter_conf != _conferencemap.end())
conf = iter_conf->second;
- if(conf != NULL)
- {
- ParticipantSet participants = conf->getParticipantList();
- ParticipantSet::iterator iter_participant = participants.begin();
- while (iter_participant != participants.end ()) {
+ if (conf != NULL) {
+ ParticipantSet participants = conf->getParticipantList();
+ ParticipantSet::iterator iter_participant = participants.begin();
- v.push_back (*iter_participant);
-
- iter_participant++;
- }
+ while (iter_participant != participants.end ()) {
+
+ v.push_back (*iter_participant);
+
+ iter_participant++;
+ }
}
return v;
diff --git a/sflphone-common/src/managerimpl.h b/sflphone-common/src/managerimpl.h
index 9689044a087e78186e9150744e70c96b063430b9..40ed90c089274127008245428af036a545b4b586 100644
--- a/sflphone-common/src/managerimpl.h
+++ b/sflphone-common/src/managerimpl.h
@@ -210,32 +210,93 @@ class ManagerImpl {
*/
bool refuseCall(const CallID& id);
+ /**
+ * Create a new conference given two participant
+ * @param the first participant ID
+ * @param the second participant ID
+ */
Conference* createConference(const CallID& id1, const CallID& id2);
+ /**
+ * Delete this conference
+ * @param the conference ID
+ */
void removeConference(const CallID& conference_id);
+ /**
+ * Return the conference id for which this call is attached
+ * @ param the call id
+ */
Conference* getConferenceFromCallID(const CallID& call_id);
+ /**
+ * Hold every participant to a conference
+ * @param the conference id
+ */
void holdConference(const CallID& conferece_id);
+ /**
+ * Unhold all conference participants
+ * @param the conference id
+ */
void unHoldConference(const CallID& conference_id);
+ /**
+ * Test if this id is a conference (usefull to test current call)
+ * @param the call id
+ */
bool isConference(const CallID& call_id);
+ /**
+ * Test if a call id particips to this conference
+ * @param the call id
+ */
bool participToConference(const CallID& call_id);
+ /**
+ * Add a participant to a conference
+ * @param the call id
+ * @param the conference id
+ */
void addParticipant(const CallID& call_id, const CallID& conference_id);
+ /**
+ * Bind the main participant to a conference (mainly called on a double click action)
+ * @param the conference id
+ */
void addMainParticipant(const CallID& conference_id);
+ /**
+ * Join two participants to create a conference
+ * @param the fist call id
+ * @param the second call id
+ */
void joinParticipant(const CallID& call_id1, const CallID& call_id2);
+ /**
+ * Detach a participant from a conference, put the call on hold, do not hangup it
+ * @param call id
+ * @param the current call id
+ */
void detachParticipant(const CallID& call_id, const CallID& current_call_id);
+ /**
+ * Remove the conference participant from a conference
+ * @param call id
+ */
void removeParticipant(const CallID& call_id);
-
+
+ /**
+ * Process remaining participant given a conference and the current call id.
+ * Mainly called when a participant is detached or hagned up
+ * @param current call id
+ * @param conference pointer
+ */
void processRemainingParticipant(CallID current_call_id, Conference *conf);
+ /**
+ * Join two conference together into one unique conference
+ */
void joinConference(const CallID& conf_id1, const CallID& conf_id2);
void addStream(const CallID& call_id);
@@ -743,9 +804,6 @@ class ManagerImpl {
void switchAudioManager( void );
- void setPulseAppVolumeControl( void );
- std::string getPulseAppVolumeControl( void );
-
/**
* Get the desktop mail notification level
* @return int The mail notification level
@@ -1039,12 +1097,6 @@ class ManagerImpl {
*/
void initVolume();
- /**
- * Tell if there is a current call processed
- * @return bool True if there is a current call
- */
- bool hasCurrentCall();
-
/**
* Switch of current call id
* @param id The new callid
@@ -1206,6 +1258,12 @@ class ManagerImpl {
public:
+
+ /**
+ * Tell if there is a current call processed
+ * @return bool True if there is a current call
+ */
+ bool hasCurrentCall();
/**
* Return the current DBusManagerImpl
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index 5f6871806d9dd13ee6738de76c1ed3595819d4c8..00b862ae92d33249201bc62dfde65e8a4273001d 100644
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -201,17 +201,17 @@ int SIPAccount::registerVoIPLink()
int SIPAccount::unregisterVoIPLink()
{
- _debug ("unregister account %s\n" , getAccountID().c_str());
+ _debug ("Unregister account %s\n" , getAccountID().c_str());
if (_accountID == IP2IP_PROFILE) {
return true;
}
if (_link->sendUnregister (_accountID)) {
- setRegistrationInfo (NULL);
- return true;
+ setRegistrationInfo (NULL);
+ return true;
} else
- return false;
+ return false;
}
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index d8001dc1b7a6510c4b9afe35aad46f1961ab755f..6fb1b24947398574d2a30c76340704df2efb7b1e 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -585,7 +585,7 @@ int SIPVoIPLink::sendRegister (AccountID id)
return false;
}
- pjsip_tpselector *tp;
+ // pjsip_tpselector *tp;
// init_transport_selector (account->getAccountTransport (), &tp);
// status = pjsip_regc_set_transport (regc, tp);
@@ -2845,7 +2845,7 @@ mod_on_rx_request (pjsip_rx_data *rdata)
SIPAccount *account;
pjmedia_sdp_session *r_sdp;
- pjsip_generic_string_hdr* hdr;
+ // pjsip_generic_string_hdr* hdr;
// voicemail part
std::string method_name;
@@ -2888,10 +2888,18 @@ mod_on_rx_request (pjsip_rx_data *rdata)
char* from_header = strstr(rdata->msg_info.msg_buf, "From: ");
// _debug("------------------------------ thefromheader: %s\n", from_header);
- //char* display_name = strtok(from_header, "\"");
- //display_name = strtok(NULL, "\"");
- //_debug("UserAgent: The displayname for this call: %s\n", display_name);
- displayName = string("");//display_name);
+
+ if(from_header) {
+
+ std::string temp(from_header);
+ int begin_displayName = temp.find("\"") + 1;
+ int end_displayName = temp.rfind("\"");
+ // _debug("The display name start at %i, end at %i\n", begin_displayName, end_displayName);
+ displayName = temp.substr(begin_displayName, end_displayName - begin_displayName);//display_name);
+ }
+ else {
+ displayName = std::string("");
+ }
_debug ("UserAgent: The receiver is : %s@%s\n", userName.data(), server.data());
@@ -2903,7 +2911,7 @@ mod_on_rx_request (pjsip_rx_data *rdata)
// display_name = rdata->msg_info.from->name;
- std::string temp("");///(char*)(&display_name));
+ // std::string temp("");///(char*)(&display_name));
sip_uri = (pjsip_sip_uri *) pjsip_uri_get_uri (uri);
diff --git a/sflphone-common/src/sip/sipvoiplink.h b/sflphone-common/src/sip/sipvoiplink.h
index f2c49302b80f98d85ac29795e71f7cdd7064977e..6d437d4bf78354c2d4f5e0a925b49d633be54b0a 100644
--- a/sflphone-common/src/sip/sipvoiplink.h
+++ b/sflphone-common/src/sip/sipvoiplink.h
@@ -43,7 +43,7 @@ class SIPCall;
#define RANDOM_SIP_PORT rand() % 64000 + 1024
// To set the verbosity. From 0 (min) to 6 (max)
-#define PJ_LOG_LEVEL 6
+#define PJ_LOG_LEVEL 1
/**
* @file sipvoiplink.h