6767
6968
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
6770
@@ -11753,9 +11091,9 @@
6771
if test -n "$ac_tool_prefix"; then
6772
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
6773
set dummy ${ac_tool_prefix}gcc; ac_word=$2
6774
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6775
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6776
$as_echo_n "checking for $ac_word... " >&6; }
6777
-if test "${ac_cv_prog_CC+set}" = set; then
6778
+if test "${ac_cv_prog_CC+set}" = set; then :
6779
$as_echo_n "(cached) " >&6
6781
if test -n "$CC"; then
6782
@@ -11766,24 +11104,24 @@
6785
test -z "$as_dir" && as_dir=.
6786
- for ac_exec_ext in '' $ac_executable_extensions; do
6787
+ for ac_exec_ext in '' $ac_executable_extensions; do
6788
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6789
ac_cv_prog_CC="${ac_tool_prefix}gcc"
6790
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6791
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6802
if test -n "$CC"; then
6803
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6804
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6805
$as_echo "$CC" >&6; }
6807
- { $as_echo "$as_me:$LINENO: result: no" >&5
6808
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6809
$as_echo "no" >&6; }
6812
@@ -11793,9 +11131,9 @@
6814
# Extract the first word of "gcc", so it can be a program name with args.
6815
set dummy gcc; ac_word=$2
6816
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6817
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6818
$as_echo_n "checking for $ac_word... " >&6; }
6819
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6820
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
6821
$as_echo_n "(cached) " >&6
6823
if test -n "$ac_ct_CC"; then
6824
@@ -11806,24 +11144,24 @@
6827
test -z "$as_dir" && as_dir=.
6828
- for ac_exec_ext in '' $ac_executable_extensions; do
6829
+ for ac_exec_ext in '' $ac_executable_extensions; do
6830
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6831
ac_cv_prog_ac_ct_CC="gcc"
6832
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6833
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6843
ac_ct_CC=$ac_cv_prog_ac_ct_CC
6844
if test -n "$ac_ct_CC"; then
6845
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6846
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
6847
$as_echo "$ac_ct_CC" >&6; }
6849
- { $as_echo "$as_me:$LINENO: result: no" >&5
6850
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6851
$as_echo "no" >&6; }
6854
@@ -11832,7 +11170,7 @@
6856
case $cross_compiling:$ac_tool_warned in
6858
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6859
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6860
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6861
ac_tool_warned=yes ;;
6863
@@ -11846,9 +11184,9 @@
6864
if test -n "$ac_tool_prefix"; then
6865
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
6866
set dummy ${ac_tool_prefix}cc; ac_word=$2
6867
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6868
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6869
$as_echo_n "checking for $ac_word... " >&6; }
6870
-if test "${ac_cv_prog_CC+set}" = set; then
6871
+if test "${ac_cv_prog_CC+set}" = set; then :
6872
$as_echo_n "(cached) " >&6
6874
if test -n "$CC"; then
6875
@@ -11859,24 +11197,24 @@
6878
test -z "$as_dir" && as_dir=.
6879
- for ac_exec_ext in '' $ac_executable_extensions; do
6880
+ for ac_exec_ext in '' $ac_executable_extensions; do
6881
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6882
ac_cv_prog_CC="${ac_tool_prefix}cc"
6883
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6884
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6895
if test -n "$CC"; then
6896
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6897
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6898
$as_echo "$CC" >&6; }
6900
- { $as_echo "$as_me:$LINENO: result: no" >&5
6901
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6902
$as_echo "no" >&6; }
6905
@@ -11886,9 +11224,9 @@
6906
if test -z "$CC"; then
6907
# Extract the first word of "cc", so it can be a program name with args.
6908
set dummy cc; ac_word=$2
6909
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6910
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6911
$as_echo_n "checking for $ac_word... " >&6; }
6912
-if test "${ac_cv_prog_CC+set}" = set; then
6913
+if test "${ac_cv_prog_CC+set}" = set; then :
6914
$as_echo_n "(cached) " >&6
6916
if test -n "$CC"; then
6917
@@ -11900,18 +11238,18 @@
6920
test -z "$as_dir" && as_dir=.
6921
- for ac_exec_ext in '' $ac_executable_extensions; do
6922
+ for ac_exec_ext in '' $ac_executable_extensions; do
6923
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6924
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
6925
ac_prog_rejected=yes
6929
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6930
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6938
if test $ac_prog_rejected = yes; then
6939
@@ -11930,10 +11268,10 @@
6942
if test -n "$CC"; then
6943
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6944
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6945
$as_echo "$CC" >&6; }
6947
- { $as_echo "$as_me:$LINENO: result: no" >&5
6948
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6949
$as_echo "no" >&6; }
6952
@@ -11945,9 +11283,9 @@
6954
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6955
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6956
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6957
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6958
$as_echo_n "checking for $ac_word... " >&6; }
6959
-if test "${ac_cv_prog_CC+set}" = set; then
6960
+if test "${ac_cv_prog_CC+set}" = set; then :
6961
$as_echo_n "(cached) " >&6
6963
if test -n "$CC"; then
6964
@@ -11958,24 +11296,24 @@
6967
test -z "$as_dir" && as_dir=.
6968
- for ac_exec_ext in '' $ac_executable_extensions; do
6969
+ for ac_exec_ext in '' $ac_executable_extensions; do
6970
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6971
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
6972
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6973
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6984
if test -n "$CC"; then
6985
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
6986
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
6987
$as_echo "$CC" >&6; }
6989
- { $as_echo "$as_me:$LINENO: result: no" >&5
6990
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6991
$as_echo "no" >&6; }
6994
@@ -11989,9 +11327,9 @@
6996
# Extract the first word of "$ac_prog", so it can be a program name with args.
6997
set dummy $ac_prog; ac_word=$2
6998
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6999
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7000
$as_echo_n "checking for $ac_word... " >&6; }
7001
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7002
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7003
$as_echo_n "(cached) " >&6
7005
if test -n "$ac_ct_CC"; then
7006
@@ -12002,24 +11340,24 @@
7009
test -z "$as_dir" && as_dir=.
7010
- for ac_exec_ext in '' $ac_executable_extensions; do
7011
+ for ac_exec_ext in '' $ac_executable_extensions; do
7012
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7013
ac_cv_prog_ac_ct_CC="$ac_prog"
7014
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7015
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7025
ac_ct_CC=$ac_cv_prog_ac_ct_CC
7026
if test -n "$ac_ct_CC"; then
7027
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7028
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7029
$as_echo "$ac_ct_CC" >&6; }
7031
- { $as_echo "$as_me:$LINENO: result: no" >&5
7032
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7033
$as_echo "no" >&6; }
7036
@@ -12032,7 +11370,7 @@
7038
case $cross_compiling:$ac_tool_warned in
7040
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7041
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7042
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7043
ac_tool_warned=yes ;;
7045
@@ -12043,62 +11381,42 @@
7049
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
7050
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7051
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7052
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
7053
-See \`config.log' for more details." >&5
7054
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
7055
-See \`config.log' for more details." >&2;}
7056
- { (exit 1); exit 1; }; }; }
7057
+as_fn_error "no acceptable C compiler found in \$PATH
7058
+See \`config.log' for more details." "$LINENO" 5; }
7060
# Provide some information about the compiler.
7061
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
7062
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
7065
-{ (ac_try="$ac_compiler --version >&5"
7066
-case "(($ac_try" in
7067
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7068
- *) ac_try_echo=$ac_try;;
7070
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7071
-$as_echo "$ac_try_echo") >&5
7072
- (eval "$ac_compiler --version >&5") 2>&5
7074
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7075
- (exit $ac_status); }
7076
-{ (ac_try="$ac_compiler -v >&5"
7077
-case "(($ac_try" in
7078
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7079
- *) ac_try_echo=$ac_try;;
7081
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7082
-$as_echo "$ac_try_echo") >&5
7083
- (eval "$ac_compiler -v >&5") 2>&5
7085
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7086
- (exit $ac_status); }
7087
-{ (ac_try="$ac_compiler -V >&5"
7088
+for ac_option in --version -v -V -qversion; do
7089
+ { { ac_try="$ac_compiler $ac_option >&5"
7091
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7092
*) ac_try_echo=$ac_try;;
7094
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7095
-$as_echo "$ac_try_echo") >&5
7096
- (eval "$ac_compiler -V >&5") 2>&5
7097
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7098
+$as_echo "$ac_try_echo"; } >&5
7099
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
7101
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7102
- (exit $ac_status); }
7103
+ if test -s conftest.err; then
7105
+... rest of stderr output deleted ...
7106
+ 10q' conftest.err >conftest.er1
7107
+ cat conftest.er1 >&5
7108
+ rm -f conftest.er1 conftest.err
7110
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7111
+ test $ac_status = 0; }
7114
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
7115
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
7116
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
7117
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
7118
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
7119
$as_echo_n "(cached) " >&6
7121
- cat >conftest.$ac_ext <<_ACEOF
7124
-cat confdefs.h >>conftest.$ac_ext
7125
-cat >>conftest.$ac_ext <<_ACEOF
7126
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7127
/* end confdefs.h. */
7130
@@ -12112,37 +11430,16 @@
7134
-rm -f conftest.$ac_objext
7135
-if { (ac_try="$ac_compile"
7136
-case "(($ac_try" in
7137
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7138
- *) ac_try_echo=$ac_try;;
7140
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7141
-$as_echo "$ac_try_echo") >&5
7142
- (eval "$ac_compile") 2>conftest.er1
7144
- grep -v '^ *+' conftest.er1 >conftest.err
7145
- rm -f conftest.er1
7146
- cat conftest.err >&5
7147
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7148
- (exit $ac_status); } && {
7149
- test -z "$ac_c_werror_flag" ||
7150
- test ! -s conftest.err
7151
- } && test -s conftest.$ac_objext; then
7152
+if ac_fn_c_try_compile "$LINENO"; then :
7155
- $as_echo "$as_me: failed program was:" >&5
7156
-sed 's/^/| /' conftest.$ac_ext >&5
7158
- ac_compiler_gnu=no
7159
+ ac_compiler_gnu=no
7162
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7163
ac_cv_c_compiler_gnu=$ac_compiler_gnu
7166
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
7167
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
7168
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
7169
if test $ac_compiler_gnu = yes; then
7171
@@ -12151,20 +11448,16 @@
7173
ac_test_CFLAGS=${CFLAGS+set}
7174
ac_save_CFLAGS=$CFLAGS
7175
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
7176
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
7177
$as_echo_n "checking whether $CC accepts -g... " >&6; }
7178
-if test "${ac_cv_prog_cc_g+set}" = set; then
7179
+if test "${ac_cv_prog_cc_g+set}" = set; then :
7180
$as_echo_n "(cached) " >&6
7182
ac_save_c_werror_flag=$ac_c_werror_flag
7183
ac_c_werror_flag=yes
7186
- cat >conftest.$ac_ext <<_ACEOF
7189
-cat confdefs.h >>conftest.$ac_ext
7190
-cat >>conftest.$ac_ext <<_ACEOF
7191
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7192
/* end confdefs.h. */
7195
@@ -12175,35 +11468,11 @@
7199
-rm -f conftest.$ac_objext
7200
-if { (ac_try="$ac_compile"
7201
-case "(($ac_try" in
7202
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7203
- *) ac_try_echo=$ac_try;;
7205
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7206
-$as_echo "$ac_try_echo") >&5
7207
- (eval "$ac_compile") 2>conftest.er1
7209
- grep -v '^ *+' conftest.er1 >conftest.err
7210
- rm -f conftest.er1
7211
- cat conftest.err >&5
7212
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7213
- (exit $ac_status); } && {
7214
- test -z "$ac_c_werror_flag" ||
7215
- test ! -s conftest.err
7216
- } && test -s conftest.$ac_objext; then
7217
+if ac_fn_c_try_compile "$LINENO"; then :
7220
- $as_echo "$as_me: failed program was:" >&5
7221
-sed 's/^/| /' conftest.$ac_ext >&5
7224
- cat >conftest.$ac_ext <<_ACEOF
7227
-cat confdefs.h >>conftest.$ac_ext
7228
-cat >>conftest.$ac_ext <<_ACEOF
7230
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7231
/* end confdefs.h. */
7234
@@ -12214,36 +11483,12 @@
7238
-rm -f conftest.$ac_objext
7239
-if { (ac_try="$ac_compile"
7240
-case "(($ac_try" in
7241
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7242
- *) ac_try_echo=$ac_try;;
7244
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7245
-$as_echo "$ac_try_echo") >&5
7246
- (eval "$ac_compile") 2>conftest.er1
7248
- grep -v '^ *+' conftest.er1 >conftest.err
7249
- rm -f conftest.er1
7250
- cat conftest.err >&5
7251
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7252
- (exit $ac_status); } && {
7253
- test -z "$ac_c_werror_flag" ||
7254
- test ! -s conftest.err
7255
- } && test -s conftest.$ac_objext; then
7258
- $as_echo "$as_me: failed program was:" >&5
7259
-sed 's/^/| /' conftest.$ac_ext >&5
7260
+if ac_fn_c_try_compile "$LINENO"; then :
7262
- ac_c_werror_flag=$ac_save_c_werror_flag
7264
+ ac_c_werror_flag=$ac_save_c_werror_flag
7266
- cat >conftest.$ac_ext <<_ACEOF
7269
-cat confdefs.h >>conftest.$ac_ext
7270
-cat >>conftest.$ac_ext <<_ACEOF
7271
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7272
/* end confdefs.h. */
7275
@@ -12254,42 +11499,17 @@
7279
-rm -f conftest.$ac_objext
7280
-if { (ac_try="$ac_compile"
7281
-case "(($ac_try" in
7282
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7283
- *) ac_try_echo=$ac_try;;
7285
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7286
-$as_echo "$ac_try_echo") >&5
7287
- (eval "$ac_compile") 2>conftest.er1
7289
- grep -v '^ *+' conftest.er1 >conftest.err
7290
- rm -f conftest.er1
7291
- cat conftest.err >&5
7292
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7293
- (exit $ac_status); } && {
7294
- test -z "$ac_c_werror_flag" ||
7295
- test ! -s conftest.err
7296
- } && test -s conftest.$ac_objext; then
7297
+if ac_fn_c_try_compile "$LINENO"; then :
7300
- $as_echo "$as_me: failed program was:" >&5
7301
-sed 's/^/| /' conftest.$ac_ext >&5
7306
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7309
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7312
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7313
ac_c_werror_flag=$ac_save_c_werror_flag
7315
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
7316
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
7317
$as_echo "$ac_cv_prog_cc_g" >&6; }
7318
if test "$ac_test_CFLAGS" = set; then
7319
CFLAGS=$ac_save_CFLAGS
7320
@@ -12306,18 +11526,14 @@
7324
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
7325
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
7326
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
7327
-if test "${ac_cv_prog_cc_c89+set}" = set; then
7328
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
7329
$as_echo_n "(cached) " >&6
7331
ac_cv_prog_cc_c89=no
7333
-cat >conftest.$ac_ext <<_ACEOF
7336
-cat confdefs.h >>conftest.$ac_ext
7337
-cat >>conftest.$ac_ext <<_ACEOF
7338
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7339
/* end confdefs.h. */
7342
@@ -12374,32 +11590,9 @@
7343
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7345
CC="$ac_save_CC $ac_arg"
7346
- rm -f conftest.$ac_objext
7347
-if { (ac_try="$ac_compile"
7348
-case "(($ac_try" in
7349
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7350
- *) ac_try_echo=$ac_try;;
7352
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7353
-$as_echo "$ac_try_echo") >&5
7354
- (eval "$ac_compile") 2>conftest.er1
7356
- grep -v '^ *+' conftest.er1 >conftest.err
7357
- rm -f conftest.er1
7358
- cat conftest.err >&5
7359
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7360
- (exit $ac_status); } && {
7361
- test -z "$ac_c_werror_flag" ||
7362
- test ! -s conftest.err
7363
- } && test -s conftest.$ac_objext; then
7364
+ if ac_fn_c_try_compile "$LINENO"; then :
7365
ac_cv_prog_cc_c89=$ac_arg
7367
- $as_echo "$as_me: failed program was:" >&5
7368
-sed 's/^/| /' conftest.$ac_ext >&5
7373
rm -f core conftest.err conftest.$ac_objext
7374
test "x$ac_cv_prog_cc_c89" != "xno" && break
7376
@@ -12410,17 +11603,19 @@
7378
case "x$ac_cv_prog_cc_c89" in
7380
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
7381
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
7382
$as_echo "none needed" >&6; } ;;
7384
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
7385
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
7386
$as_echo "unsupported" >&6; } ;;
7388
CC="$CC $ac_cv_prog_cc_c89"
7389
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
7390
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
7391
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
7393
+if test "x$ac_cv_prog_cc_c89" != xno; then :
7398
ac_cpp='$CPP $CPPFLAGS'
7399
@@ -12430,9 +11625,9 @@
7401
depcc="$CC" am_compiler_list=
7403
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
7404
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
7405
$as_echo_n "checking dependency style of $depcc... " >&6; }
7406
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
7407
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
7408
$as_echo_n "(cached) " >&6
7410
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
7411
@@ -12540,7 +11735,7 @@
7415
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
7416
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
7417
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
7418
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
7420
@@ -12563,9 +11758,9 @@
7421
if test -n "$ac_tool_prefix"; then
7422
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
7423
set dummy ${ac_tool_prefix}gcc; ac_word=$2
7424
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7425
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7426
$as_echo_n "checking for $ac_word... " >&6; }
7427
-if test "${ac_cv_prog_CC+set}" = set; then
7428
+if test "${ac_cv_prog_CC+set}" = set; then :
7429
$as_echo_n "(cached) " >&6
7431
if test -n "$CC"; then
7432
@@ -12576,24 +11771,24 @@
7435
test -z "$as_dir" && as_dir=.
7436
- for ac_exec_ext in '' $ac_executable_extensions; do
7437
+ for ac_exec_ext in '' $ac_executable_extensions; do
7438
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7439
ac_cv_prog_CC="${ac_tool_prefix}gcc"
7440
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7441
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7452
if test -n "$CC"; then
7453
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7454
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7455
$as_echo "$CC" >&6; }
7457
- { $as_echo "$as_me:$LINENO: result: no" >&5
7458
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7459
$as_echo "no" >&6; }
7462
@@ -12603,9 +11798,9 @@
7464
# Extract the first word of "gcc", so it can be a program name with args.
7465
set dummy gcc; ac_word=$2
7466
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7467
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7468
$as_echo_n "checking for $ac_word... " >&6; }
7469
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7470
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7471
$as_echo_n "(cached) " >&6
7473
if test -n "$ac_ct_CC"; then
7474
@@ -12616,24 +11811,24 @@
7477
test -z "$as_dir" && as_dir=.
7478
- for ac_exec_ext in '' $ac_executable_extensions; do
7479
+ for ac_exec_ext in '' $ac_executable_extensions; do
7480
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7481
ac_cv_prog_ac_ct_CC="gcc"
7482
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7483
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7493
ac_ct_CC=$ac_cv_prog_ac_ct_CC
7494
if test -n "$ac_ct_CC"; then
7495
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7496
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7497
$as_echo "$ac_ct_CC" >&6; }
7499
- { $as_echo "$as_me:$LINENO: result: no" >&5
7500
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7501
$as_echo "no" >&6; }
7504
@@ -12642,7 +11837,7 @@
7506
case $cross_compiling:$ac_tool_warned in
7508
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7509
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7510
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7511
ac_tool_warned=yes ;;
7513
@@ -12656,9 +11851,9 @@
7514
if test -n "$ac_tool_prefix"; then
7515
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
7516
set dummy ${ac_tool_prefix}cc; ac_word=$2
7517
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7518
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7519
$as_echo_n "checking for $ac_word... " >&6; }
7520
-if test "${ac_cv_prog_CC+set}" = set; then
7521
+if test "${ac_cv_prog_CC+set}" = set; then :
7522
$as_echo_n "(cached) " >&6
7524
if test -n "$CC"; then
7525
@@ -12669,24 +11864,24 @@
7528
test -z "$as_dir" && as_dir=.
7529
- for ac_exec_ext in '' $ac_executable_extensions; do
7530
+ for ac_exec_ext in '' $ac_executable_extensions; do
7531
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7532
ac_cv_prog_CC="${ac_tool_prefix}cc"
7533
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7534
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7545
if test -n "$CC"; then
7546
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7547
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7548
$as_echo "$CC" >&6; }
7550
- { $as_echo "$as_me:$LINENO: result: no" >&5
7551
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7552
$as_echo "no" >&6; }
7555
@@ -12696,9 +11891,9 @@
7556
if test -z "$CC"; then
7557
# Extract the first word of "cc", so it can be a program name with args.
7558
set dummy cc; ac_word=$2
7559
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7560
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7561
$as_echo_n "checking for $ac_word... " >&6; }
7562
-if test "${ac_cv_prog_CC+set}" = set; then
7563
+if test "${ac_cv_prog_CC+set}" = set; then :
7564
$as_echo_n "(cached) " >&6
7566
if test -n "$CC"; then
7567
@@ -12710,18 +11905,18 @@
7570
test -z "$as_dir" && as_dir=.
7571
- for ac_exec_ext in '' $ac_executable_extensions; do
7572
+ for ac_exec_ext in '' $ac_executable_extensions; do
7573
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7574
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
7575
ac_prog_rejected=yes
7579
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7580
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7588
if test $ac_prog_rejected = yes; then
7589
@@ -12740,10 +11935,10 @@
7592
if test -n "$CC"; then
7593
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7594
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7595
$as_echo "$CC" >&6; }
7597
- { $as_echo "$as_me:$LINENO: result: no" >&5
7598
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7599
$as_echo "no" >&6; }
7602
@@ -12755,9 +11950,9 @@
7604
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7605
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7606
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7607
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7608
$as_echo_n "checking for $ac_word... " >&6; }
7609
-if test "${ac_cv_prog_CC+set}" = set; then
7610
+if test "${ac_cv_prog_CC+set}" = set; then :
7611
$as_echo_n "(cached) " >&6
7613
if test -n "$CC"; then
7614
@@ -12768,24 +11963,24 @@
7617
test -z "$as_dir" && as_dir=.
7618
- for ac_exec_ext in '' $ac_executable_extensions; do
7619
+ for ac_exec_ext in '' $ac_executable_extensions; do
7620
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7621
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
7622
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7623
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7634
if test -n "$CC"; then
7635
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7636
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7637
$as_echo "$CC" >&6; }
7639
- { $as_echo "$as_me:$LINENO: result: no" >&5
7640
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7641
$as_echo "no" >&6; }
7644
@@ -12799,9 +11994,9 @@
7646
# Extract the first word of "$ac_prog", so it can be a program name with args.
7647
set dummy $ac_prog; ac_word=$2
7648
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7649
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7650
$as_echo_n "checking for $ac_word... " >&6; }
7651
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7652
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7653
$as_echo_n "(cached) " >&6
7655
if test -n "$ac_ct_CC"; then
7656
@@ -12812,24 +12007,24 @@
7659
test -z "$as_dir" && as_dir=.
7660
- for ac_exec_ext in '' $ac_executable_extensions; do
7661
+ for ac_exec_ext in '' $ac_executable_extensions; do
7662
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7663
ac_cv_prog_ac_ct_CC="$ac_prog"
7664
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7665
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7675
ac_ct_CC=$ac_cv_prog_ac_ct_CC
7676
if test -n "$ac_ct_CC"; then
7677
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7678
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7679
$as_echo "$ac_ct_CC" >&6; }
7681
- { $as_echo "$as_me:$LINENO: result: no" >&5
7682
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7683
$as_echo "no" >&6; }
7686
@@ -12842,7 +12037,7 @@
7688
case $cross_compiling:$ac_tool_warned in
7690
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7691
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7692
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7693
ac_tool_warned=yes ;;
7695
@@ -12853,62 +12048,42 @@
7699
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
7700
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7701
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7702
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
7703
-See \`config.log' for more details." >&5
7704
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
7705
-See \`config.log' for more details." >&2;}
7706
- { (exit 1); exit 1; }; }; }
7707
+as_fn_error "no acceptable C compiler found in \$PATH
7708
+See \`config.log' for more details." "$LINENO" 5; }
7710
# Provide some information about the compiler.
7711
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
7712
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
7715
-{ (ac_try="$ac_compiler --version >&5"
7716
-case "(($ac_try" in
7717
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7718
- *) ac_try_echo=$ac_try;;
7720
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7721
-$as_echo "$ac_try_echo") >&5
7722
- (eval "$ac_compiler --version >&5") 2>&5
7724
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7725
- (exit $ac_status); }
7726
-{ (ac_try="$ac_compiler -v >&5"
7727
-case "(($ac_try" in
7728
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7729
- *) ac_try_echo=$ac_try;;
7731
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7732
-$as_echo "$ac_try_echo") >&5
7733
- (eval "$ac_compiler -v >&5") 2>&5
7735
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7736
- (exit $ac_status); }
7737
-{ (ac_try="$ac_compiler -V >&5"
7738
+for ac_option in --version -v -V -qversion; do
7739
+ { { ac_try="$ac_compiler $ac_option >&5"
7741
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7742
*) ac_try_echo=$ac_try;;
7744
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7745
-$as_echo "$ac_try_echo") >&5
7746
- (eval "$ac_compiler -V >&5") 2>&5
7747
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7748
+$as_echo "$ac_try_echo"; } >&5
7749
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
7751
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7752
- (exit $ac_status); }
7753
+ if test -s conftest.err; then
7755
+... rest of stderr output deleted ...
7756
+ 10q' conftest.err >conftest.er1
7757
+ cat conftest.er1 >&5
7758
+ rm -f conftest.er1 conftest.err
7760
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7761
+ test $ac_status = 0; }
7764
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
7765
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
7766
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
7767
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
7768
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
7769
$as_echo_n "(cached) " >&6
7771
- cat >conftest.$ac_ext <<_ACEOF
7774
-cat confdefs.h >>conftest.$ac_ext
7775
-cat >>conftest.$ac_ext <<_ACEOF
7776
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7777
/* end confdefs.h. */
7780
@@ -12922,37 +12097,16 @@
7784
-rm -f conftest.$ac_objext
7785
-if { (ac_try="$ac_compile"
7786
-case "(($ac_try" in
7787
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7788
- *) ac_try_echo=$ac_try;;
7790
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7791
-$as_echo "$ac_try_echo") >&5
7792
- (eval "$ac_compile") 2>conftest.er1
7794
- grep -v '^ *+' conftest.er1 >conftest.err
7795
- rm -f conftest.er1
7796
- cat conftest.err >&5
7797
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7798
- (exit $ac_status); } && {
7799
- test -z "$ac_c_werror_flag" ||
7800
- test ! -s conftest.err
7801
- } && test -s conftest.$ac_objext; then
7802
+if ac_fn_c_try_compile "$LINENO"; then :
7805
- $as_echo "$as_me: failed program was:" >&5
7806
-sed 's/^/| /' conftest.$ac_ext >&5
7808
- ac_compiler_gnu=no
7809
+ ac_compiler_gnu=no
7812
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7813
ac_cv_c_compiler_gnu=$ac_compiler_gnu
7816
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
7817
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
7818
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
7819
if test $ac_compiler_gnu = yes; then
7821
@@ -12961,20 +12115,16 @@
7823
ac_test_CFLAGS=${CFLAGS+set}
7824
ac_save_CFLAGS=$CFLAGS
7825
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
7826
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
7827
$as_echo_n "checking whether $CC accepts -g... " >&6; }
7828
-if test "${ac_cv_prog_cc_g+set}" = set; then
7829
+if test "${ac_cv_prog_cc_g+set}" = set; then :
7830
$as_echo_n "(cached) " >&6
7832
ac_save_c_werror_flag=$ac_c_werror_flag
7833
ac_c_werror_flag=yes
7836
- cat >conftest.$ac_ext <<_ACEOF
7839
-cat confdefs.h >>conftest.$ac_ext
7840
-cat >>conftest.$ac_ext <<_ACEOF
7841
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7842
/* end confdefs.h. */
7845
@@ -12985,35 +12135,11 @@
7849
-rm -f conftest.$ac_objext
7850
-if { (ac_try="$ac_compile"
7851
-case "(($ac_try" in
7852
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7853
- *) ac_try_echo=$ac_try;;
7855
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7856
-$as_echo "$ac_try_echo") >&5
7857
- (eval "$ac_compile") 2>conftest.er1
7859
- grep -v '^ *+' conftest.er1 >conftest.err
7860
- rm -f conftest.er1
7861
- cat conftest.err >&5
7862
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7863
- (exit $ac_status); } && {
7864
- test -z "$ac_c_werror_flag" ||
7865
- test ! -s conftest.err
7866
- } && test -s conftest.$ac_objext; then
7867
+if ac_fn_c_try_compile "$LINENO"; then :
7870
- $as_echo "$as_me: failed program was:" >&5
7871
-sed 's/^/| /' conftest.$ac_ext >&5
7874
- cat >conftest.$ac_ext <<_ACEOF
7877
-cat confdefs.h >>conftest.$ac_ext
7878
-cat >>conftest.$ac_ext <<_ACEOF
7880
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7881
/* end confdefs.h. */
7884
@@ -13024,36 +12150,12 @@
7888
-rm -f conftest.$ac_objext
7889
-if { (ac_try="$ac_compile"
7890
-case "(($ac_try" in
7891
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7892
- *) ac_try_echo=$ac_try;;
7894
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7895
-$as_echo "$ac_try_echo") >&5
7896
- (eval "$ac_compile") 2>conftest.er1
7898
- grep -v '^ *+' conftest.er1 >conftest.err
7899
- rm -f conftest.er1
7900
- cat conftest.err >&5
7901
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7902
- (exit $ac_status); } && {
7903
- test -z "$ac_c_werror_flag" ||
7904
- test ! -s conftest.err
7905
- } && test -s conftest.$ac_objext; then
7908
- $as_echo "$as_me: failed program was:" >&5
7909
-sed 's/^/| /' conftest.$ac_ext >&5
7910
+if ac_fn_c_try_compile "$LINENO"; then :
7912
- ac_c_werror_flag=$ac_save_c_werror_flag
7914
+ ac_c_werror_flag=$ac_save_c_werror_flag
7916
- cat >conftest.$ac_ext <<_ACEOF
7919
-cat confdefs.h >>conftest.$ac_ext
7920
-cat >>conftest.$ac_ext <<_ACEOF
7921
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7922
/* end confdefs.h. */
7925
@@ -13064,42 +12166,17 @@
7929
-rm -f conftest.$ac_objext
7930
-if { (ac_try="$ac_compile"
7931
-case "(($ac_try" in
7932
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7933
- *) ac_try_echo=$ac_try;;
7935
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7936
-$as_echo "$ac_try_echo") >&5
7937
- (eval "$ac_compile") 2>conftest.er1
7939
- grep -v '^ *+' conftest.er1 >conftest.err
7940
- rm -f conftest.er1
7941
- cat conftest.err >&5
7942
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7943
- (exit $ac_status); } && {
7944
- test -z "$ac_c_werror_flag" ||
7945
- test ! -s conftest.err
7946
- } && test -s conftest.$ac_objext; then
7947
+if ac_fn_c_try_compile "$LINENO"; then :
7950
- $as_echo "$as_me: failed program was:" >&5
7951
-sed 's/^/| /' conftest.$ac_ext >&5
7956
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7959
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7962
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7963
ac_c_werror_flag=$ac_save_c_werror_flag
7965
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
7966
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
7967
$as_echo "$ac_cv_prog_cc_g" >&6; }
7968
if test "$ac_test_CFLAGS" = set; then
7969
CFLAGS=$ac_save_CFLAGS
7970
@@ -13116,18 +12193,14 @@
7974
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
7975
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
7976
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
7977
-if test "${ac_cv_prog_cc_c89+set}" = set; then
7978
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
7979
$as_echo_n "(cached) " >&6
7981
ac_cv_prog_cc_c89=no
7983
-cat >conftest.$ac_ext <<_ACEOF
7986
-cat confdefs.h >>conftest.$ac_ext
7987
-cat >>conftest.$ac_ext <<_ACEOF
7988
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7989
/* end confdefs.h. */
7992
@@ -13184,32 +12257,9 @@
7993
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7995
CC="$ac_save_CC $ac_arg"
7996
- rm -f conftest.$ac_objext
7997
-if { (ac_try="$ac_compile"
7998
-case "(($ac_try" in
7999
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8000
- *) ac_try_echo=$ac_try;;
8002
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8003
-$as_echo "$ac_try_echo") >&5
8004
- (eval "$ac_compile") 2>conftest.er1
8006
- grep -v '^ *+' conftest.er1 >conftest.err
8007
- rm -f conftest.er1
8008
- cat conftest.err >&5
8009
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8010
- (exit $ac_status); } && {
8011
- test -z "$ac_c_werror_flag" ||
8012
- test ! -s conftest.err
8013
- } && test -s conftest.$ac_objext; then
8014
+ if ac_fn_c_try_compile "$LINENO"; then :
8015
ac_cv_prog_cc_c89=$ac_arg
8017
- $as_echo "$as_me: failed program was:" >&5
8018
-sed 's/^/| /' conftest.$ac_ext >&5
8023
rm -f core conftest.err conftest.$ac_objext
8024
test "x$ac_cv_prog_cc_c89" != "xno" && break
8026
@@ -13220,17 +12270,19 @@
8028
case "x$ac_cv_prog_cc_c89" in
8030
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
8031
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
8032
$as_echo "none needed" >&6; } ;;
8034
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
8035
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
8036
$as_echo "unsupported" >&6; } ;;
8038
CC="$CC $ac_cv_prog_cc_c89"
8039
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
8040
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
8041
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
8043
+if test "x$ac_cv_prog_cc_c89" != xno; then :
8048
ac_cpp='$CPP $CPPFLAGS'
8049
@@ -13240,9 +12292,9 @@
8051
depcc="$CC" am_compiler_list=
8053
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
8054
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
8055
$as_echo_n "checking dependency style of $depcc... " >&6; }
8056
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
8057
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
8058
$as_echo_n "(cached) " >&6
8060
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
8061
@@ -13350,7 +12402,7 @@
8065
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
8066
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
8067
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
8068
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
8070
@@ -13368,16 +12420,12 @@
6971
@@ -11552,9 +10891,9 @@
6972
if test -n "$ac_tool_prefix"; then
6973
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
6974
set dummy ${ac_tool_prefix}gcc; ac_word=$2
6975
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6976
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6977
$as_echo_n "checking for $ac_word... " >&6; }
6978
-if test "${ac_cv_prog_CC+set}" = set; then
6979
+if test "${ac_cv_prog_CC+set}" = set; then :
6980
$as_echo_n "(cached) " >&6
6982
if test -n "$CC"; then
6983
@@ -11565,24 +10904,24 @@
6986
test -z "$as_dir" && as_dir=.
6987
- for ac_exec_ext in '' $ac_executable_extensions; do
6988
+ for ac_exec_ext in '' $ac_executable_extensions; do
6989
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6990
ac_cv_prog_CC="${ac_tool_prefix}gcc"
6991
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6992
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7003
if test -n "$CC"; then
7004
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7005
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7006
$as_echo "$CC" >&6; }
7008
- { $as_echo "$as_me:$LINENO: result: no" >&5
7009
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7010
$as_echo "no" >&6; }
7013
@@ -11592,9 +10931,9 @@
7015
# Extract the first word of "gcc", so it can be a program name with args.
7016
set dummy gcc; ac_word=$2
7017
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7018
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7019
$as_echo_n "checking for $ac_word... " >&6; }
7020
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7021
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7022
$as_echo_n "(cached) " >&6
7024
if test -n "$ac_ct_CC"; then
7025
@@ -11605,24 +10944,24 @@
7028
test -z "$as_dir" && as_dir=.
7029
- for ac_exec_ext in '' $ac_executable_extensions; do
7030
+ for ac_exec_ext in '' $ac_executable_extensions; do
7031
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7032
ac_cv_prog_ac_ct_CC="gcc"
7033
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7034
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7044
ac_ct_CC=$ac_cv_prog_ac_ct_CC
7045
if test -n "$ac_ct_CC"; then
7046
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7047
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7048
$as_echo "$ac_ct_CC" >&6; }
7050
- { $as_echo "$as_me:$LINENO: result: no" >&5
7051
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7052
$as_echo "no" >&6; }
7055
@@ -11631,7 +10970,7 @@
7057
case $cross_compiling:$ac_tool_warned in
7059
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7060
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7061
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7062
ac_tool_warned=yes ;;
7064
@@ -11645,9 +10984,9 @@
7065
if test -n "$ac_tool_prefix"; then
7066
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
7067
set dummy ${ac_tool_prefix}cc; ac_word=$2
7068
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7069
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7070
$as_echo_n "checking for $ac_word... " >&6; }
7071
-if test "${ac_cv_prog_CC+set}" = set; then
7072
+if test "${ac_cv_prog_CC+set}" = set; then :
7073
$as_echo_n "(cached) " >&6
7075
if test -n "$CC"; then
7076
@@ -11658,24 +10997,24 @@
7079
test -z "$as_dir" && as_dir=.
7080
- for ac_exec_ext in '' $ac_executable_extensions; do
7081
+ for ac_exec_ext in '' $ac_executable_extensions; do
7082
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7083
ac_cv_prog_CC="${ac_tool_prefix}cc"
7084
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7085
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7096
if test -n "$CC"; then
7097
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7098
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7099
$as_echo "$CC" >&6; }
7101
- { $as_echo "$as_me:$LINENO: result: no" >&5
7102
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7103
$as_echo "no" >&6; }
7106
@@ -11685,9 +11024,9 @@
7107
if test -z "$CC"; then
7108
# Extract the first word of "cc", so it can be a program name with args.
7109
set dummy cc; ac_word=$2
7110
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7111
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7112
$as_echo_n "checking for $ac_word... " >&6; }
7113
-if test "${ac_cv_prog_CC+set}" = set; then
7114
+if test "${ac_cv_prog_CC+set}" = set; then :
7115
$as_echo_n "(cached) " >&6
7117
if test -n "$CC"; then
7118
@@ -11699,18 +11038,18 @@
7121
test -z "$as_dir" && as_dir=.
7122
- for ac_exec_ext in '' $ac_executable_extensions; do
7123
+ for ac_exec_ext in '' $ac_executable_extensions; do
7124
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7125
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
7126
ac_prog_rejected=yes
7130
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7131
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7139
if test $ac_prog_rejected = yes; then
7140
@@ -11729,10 +11068,10 @@
7143
if test -n "$CC"; then
7144
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7145
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7146
$as_echo "$CC" >&6; }
7148
- { $as_echo "$as_me:$LINENO: result: no" >&5
7149
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7150
$as_echo "no" >&6; }
7153
@@ -11744,9 +11083,9 @@
7155
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7156
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7157
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7158
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7159
$as_echo_n "checking for $ac_word... " >&6; }
7160
-if test "${ac_cv_prog_CC+set}" = set; then
7161
+if test "${ac_cv_prog_CC+set}" = set; then :
7162
$as_echo_n "(cached) " >&6
7164
if test -n "$CC"; then
7165
@@ -11757,24 +11096,24 @@
7168
test -z "$as_dir" && as_dir=.
7169
- for ac_exec_ext in '' $ac_executable_extensions; do
7170
+ for ac_exec_ext in '' $ac_executable_extensions; do
7171
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7172
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
7173
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7174
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7185
if test -n "$CC"; then
7186
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7187
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7188
$as_echo "$CC" >&6; }
7190
- { $as_echo "$as_me:$LINENO: result: no" >&5
7191
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7192
$as_echo "no" >&6; }
7195
@@ -11788,9 +11127,9 @@
7197
# Extract the first word of "$ac_prog", so it can be a program name with args.
7198
set dummy $ac_prog; ac_word=$2
7199
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7200
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7201
$as_echo_n "checking for $ac_word... " >&6; }
7202
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7203
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7204
$as_echo_n "(cached) " >&6
7206
if test -n "$ac_ct_CC"; then
7207
@@ -11801,24 +11140,24 @@
7210
test -z "$as_dir" && as_dir=.
7211
- for ac_exec_ext in '' $ac_executable_extensions; do
7212
+ for ac_exec_ext in '' $ac_executable_extensions; do
7213
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7214
ac_cv_prog_ac_ct_CC="$ac_prog"
7215
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7216
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7226
ac_ct_CC=$ac_cv_prog_ac_ct_CC
7227
if test -n "$ac_ct_CC"; then
7228
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7229
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7230
$as_echo "$ac_ct_CC" >&6; }
7232
- { $as_echo "$as_me:$LINENO: result: no" >&5
7233
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7234
$as_echo "no" >&6; }
7237
@@ -11831,7 +11170,7 @@
7239
case $cross_compiling:$ac_tool_warned in
7241
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7242
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7243
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7244
ac_tool_warned=yes ;;
7246
@@ -11842,62 +11181,42 @@
7250
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
7251
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7252
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7253
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
7254
-See \`config.log' for more details." >&5
7255
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
7256
-See \`config.log' for more details." >&2;}
7257
- { (exit 1); exit 1; }; }; }
7258
+as_fn_error "no acceptable C compiler found in \$PATH
7259
+See \`config.log' for more details." "$LINENO" 5; }
7261
# Provide some information about the compiler.
7262
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
7263
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
7266
-{ (ac_try="$ac_compiler --version >&5"
7267
-case "(($ac_try" in
7268
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7269
- *) ac_try_echo=$ac_try;;
7271
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7272
-$as_echo "$ac_try_echo") >&5
7273
- (eval "$ac_compiler --version >&5") 2>&5
7275
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7276
- (exit $ac_status); }
7277
-{ (ac_try="$ac_compiler -v >&5"
7278
-case "(($ac_try" in
7279
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7280
- *) ac_try_echo=$ac_try;;
7282
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7283
-$as_echo "$ac_try_echo") >&5
7284
- (eval "$ac_compiler -v >&5") 2>&5
7286
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7287
- (exit $ac_status); }
7288
-{ (ac_try="$ac_compiler -V >&5"
7289
+for ac_option in --version -v -V -qversion; do
7290
+ { { ac_try="$ac_compiler $ac_option >&5"
7292
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7293
*) ac_try_echo=$ac_try;;
7295
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7296
-$as_echo "$ac_try_echo") >&5
7297
- (eval "$ac_compiler -V >&5") 2>&5
7298
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7299
+$as_echo "$ac_try_echo"; } >&5
7300
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
7302
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7303
- (exit $ac_status); }
7304
+ if test -s conftest.err; then
7306
+... rest of stderr output deleted ...
7307
+ 10q' conftest.err >conftest.er1
7308
+ cat conftest.er1 >&5
7309
+ rm -f conftest.er1 conftest.err
7311
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7312
+ test $ac_status = 0; }
7315
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
7316
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
7317
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
7318
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
7319
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
7320
$as_echo_n "(cached) " >&6
7322
- cat >conftest.$ac_ext <<_ACEOF
7325
-cat confdefs.h >>conftest.$ac_ext
7326
-cat >>conftest.$ac_ext <<_ACEOF
7327
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7328
/* end confdefs.h. */
7331
@@ -11911,37 +11230,16 @@
7335
-rm -f conftest.$ac_objext
7336
-if { (ac_try="$ac_compile"
7337
-case "(($ac_try" in
7338
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7339
- *) ac_try_echo=$ac_try;;
7341
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7342
-$as_echo "$ac_try_echo") >&5
7343
- (eval "$ac_compile") 2>conftest.er1
7345
- grep -v '^ *+' conftest.er1 >conftest.err
7346
- rm -f conftest.er1
7347
- cat conftest.err >&5
7348
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7349
- (exit $ac_status); } && {
7350
- test -z "$ac_c_werror_flag" ||
7351
- test ! -s conftest.err
7352
- } && test -s conftest.$ac_objext; then
7353
+if ac_fn_c_try_compile "$LINENO"; then :
7356
- $as_echo "$as_me: failed program was:" >&5
7357
-sed 's/^/| /' conftest.$ac_ext >&5
7359
- ac_compiler_gnu=no
7360
+ ac_compiler_gnu=no
7363
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7364
ac_cv_c_compiler_gnu=$ac_compiler_gnu
7367
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
7368
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
7369
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
7370
if test $ac_compiler_gnu = yes; then
7372
@@ -11950,20 +11248,16 @@
7374
ac_test_CFLAGS=${CFLAGS+set}
7375
ac_save_CFLAGS=$CFLAGS
7376
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
7377
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
7378
$as_echo_n "checking whether $CC accepts -g... " >&6; }
7379
-if test "${ac_cv_prog_cc_g+set}" = set; then
7380
+if test "${ac_cv_prog_cc_g+set}" = set; then :
7381
$as_echo_n "(cached) " >&6
7383
ac_save_c_werror_flag=$ac_c_werror_flag
7384
ac_c_werror_flag=yes
7387
- cat >conftest.$ac_ext <<_ACEOF
7390
-cat confdefs.h >>conftest.$ac_ext
7391
-cat >>conftest.$ac_ext <<_ACEOF
7392
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7393
/* end confdefs.h. */
7396
@@ -11974,35 +11268,11 @@
7400
-rm -f conftest.$ac_objext
7401
-if { (ac_try="$ac_compile"
7402
-case "(($ac_try" in
7403
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7404
- *) ac_try_echo=$ac_try;;
7406
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7407
-$as_echo "$ac_try_echo") >&5
7408
- (eval "$ac_compile") 2>conftest.er1
7410
- grep -v '^ *+' conftest.er1 >conftest.err
7411
- rm -f conftest.er1
7412
- cat conftest.err >&5
7413
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7414
- (exit $ac_status); } && {
7415
- test -z "$ac_c_werror_flag" ||
7416
- test ! -s conftest.err
7417
- } && test -s conftest.$ac_objext; then
7418
+if ac_fn_c_try_compile "$LINENO"; then :
7421
- $as_echo "$as_me: failed program was:" >&5
7422
-sed 's/^/| /' conftest.$ac_ext >&5
7425
- cat >conftest.$ac_ext <<_ACEOF
7428
-cat confdefs.h >>conftest.$ac_ext
7429
-cat >>conftest.$ac_ext <<_ACEOF
7431
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7432
/* end confdefs.h. */
7435
@@ -12013,36 +11283,12 @@
7439
-rm -f conftest.$ac_objext
7440
-if { (ac_try="$ac_compile"
7441
-case "(($ac_try" in
7442
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7443
- *) ac_try_echo=$ac_try;;
7445
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7446
-$as_echo "$ac_try_echo") >&5
7447
- (eval "$ac_compile") 2>conftest.er1
7449
- grep -v '^ *+' conftest.er1 >conftest.err
7450
- rm -f conftest.er1
7451
- cat conftest.err >&5
7452
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7453
- (exit $ac_status); } && {
7454
- test -z "$ac_c_werror_flag" ||
7455
- test ! -s conftest.err
7456
- } && test -s conftest.$ac_objext; then
7459
- $as_echo "$as_me: failed program was:" >&5
7460
-sed 's/^/| /' conftest.$ac_ext >&5
7461
+if ac_fn_c_try_compile "$LINENO"; then :
7463
- ac_c_werror_flag=$ac_save_c_werror_flag
7465
+ ac_c_werror_flag=$ac_save_c_werror_flag
7467
- cat >conftest.$ac_ext <<_ACEOF
7470
-cat confdefs.h >>conftest.$ac_ext
7471
-cat >>conftest.$ac_ext <<_ACEOF
7472
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7473
/* end confdefs.h. */
7476
@@ -12053,42 +11299,17 @@
7480
-rm -f conftest.$ac_objext
7481
-if { (ac_try="$ac_compile"
7482
-case "(($ac_try" in
7483
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7484
- *) ac_try_echo=$ac_try;;
7486
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7487
-$as_echo "$ac_try_echo") >&5
7488
- (eval "$ac_compile") 2>conftest.er1
7490
- grep -v '^ *+' conftest.er1 >conftest.err
7491
- rm -f conftest.er1
7492
- cat conftest.err >&5
7493
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7494
- (exit $ac_status); } && {
7495
- test -z "$ac_c_werror_flag" ||
7496
- test ! -s conftest.err
7497
- } && test -s conftest.$ac_objext; then
7498
+if ac_fn_c_try_compile "$LINENO"; then :
7501
- $as_echo "$as_me: failed program was:" >&5
7502
-sed 's/^/| /' conftest.$ac_ext >&5
7507
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7510
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7513
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7514
ac_c_werror_flag=$ac_save_c_werror_flag
7516
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
7517
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
7518
$as_echo "$ac_cv_prog_cc_g" >&6; }
7519
if test "$ac_test_CFLAGS" = set; then
7520
CFLAGS=$ac_save_CFLAGS
7521
@@ -12105,18 +11326,14 @@
7525
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
7526
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
7527
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
7528
-if test "${ac_cv_prog_cc_c89+set}" = set; then
7529
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
7530
$as_echo_n "(cached) " >&6
7532
ac_cv_prog_cc_c89=no
7534
-cat >conftest.$ac_ext <<_ACEOF
7537
-cat confdefs.h >>conftest.$ac_ext
7538
-cat >>conftest.$ac_ext <<_ACEOF
7539
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7540
/* end confdefs.h. */
7543
@@ -12173,32 +11390,9 @@
7544
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7546
CC="$ac_save_CC $ac_arg"
7547
- rm -f conftest.$ac_objext
7548
-if { (ac_try="$ac_compile"
7549
-case "(($ac_try" in
7550
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7551
- *) ac_try_echo=$ac_try;;
7553
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7554
-$as_echo "$ac_try_echo") >&5
7555
- (eval "$ac_compile") 2>conftest.er1
7557
- grep -v '^ *+' conftest.er1 >conftest.err
7558
- rm -f conftest.er1
7559
- cat conftest.err >&5
7560
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7561
- (exit $ac_status); } && {
7562
- test -z "$ac_c_werror_flag" ||
7563
- test ! -s conftest.err
7564
- } && test -s conftest.$ac_objext; then
7565
+ if ac_fn_c_try_compile "$LINENO"; then :
7566
ac_cv_prog_cc_c89=$ac_arg
7568
- $as_echo "$as_me: failed program was:" >&5
7569
-sed 's/^/| /' conftest.$ac_ext >&5
7574
rm -f core conftest.err conftest.$ac_objext
7575
test "x$ac_cv_prog_cc_c89" != "xno" && break
7577
@@ -12209,17 +11403,19 @@
7579
case "x$ac_cv_prog_cc_c89" in
7581
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
7582
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
7583
$as_echo "none needed" >&6; } ;;
7585
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
7586
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
7587
$as_echo "unsupported" >&6; } ;;
7589
CC="$CC $ac_cv_prog_cc_c89"
7590
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
7591
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
7592
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
7594
+if test "x$ac_cv_prog_cc_c89" != xno; then :
7599
ac_cpp='$CPP $CPPFLAGS'
7600
@@ -12229,9 +11425,9 @@
7602
depcc="$CC" am_compiler_list=
7604
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
7605
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
7606
$as_echo_n "checking dependency style of $depcc... " >&6; }
7607
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
7608
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
7609
$as_echo_n "(cached) " >&6
7611
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
7612
@@ -12339,7 +11535,7 @@
7616
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
7617
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
7618
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
7619
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
7621
@@ -12362,9 +11558,9 @@
7622
if test -n "$ac_tool_prefix"; then
7623
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
7624
set dummy ${ac_tool_prefix}gcc; ac_word=$2
7625
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7626
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7627
$as_echo_n "checking for $ac_word... " >&6; }
7628
-if test "${ac_cv_prog_CC+set}" = set; then
7629
+if test "${ac_cv_prog_CC+set}" = set; then :
7630
$as_echo_n "(cached) " >&6
7632
if test -n "$CC"; then
7633
@@ -12375,24 +11571,24 @@
7636
test -z "$as_dir" && as_dir=.
7637
- for ac_exec_ext in '' $ac_executable_extensions; do
7638
+ for ac_exec_ext in '' $ac_executable_extensions; do
7639
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7640
ac_cv_prog_CC="${ac_tool_prefix}gcc"
7641
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7642
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7653
if test -n "$CC"; then
7654
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7655
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7656
$as_echo "$CC" >&6; }
7658
- { $as_echo "$as_me:$LINENO: result: no" >&5
7659
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7660
$as_echo "no" >&6; }
7663
@@ -12402,9 +11598,9 @@
7665
# Extract the first word of "gcc", so it can be a program name with args.
7666
set dummy gcc; ac_word=$2
7667
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7668
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7669
$as_echo_n "checking for $ac_word... " >&6; }
7670
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7671
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7672
$as_echo_n "(cached) " >&6
7674
if test -n "$ac_ct_CC"; then
7675
@@ -12415,24 +11611,24 @@
7678
test -z "$as_dir" && as_dir=.
7679
- for ac_exec_ext in '' $ac_executable_extensions; do
7680
+ for ac_exec_ext in '' $ac_executable_extensions; do
7681
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7682
ac_cv_prog_ac_ct_CC="gcc"
7683
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7684
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7694
ac_ct_CC=$ac_cv_prog_ac_ct_CC
7695
if test -n "$ac_ct_CC"; then
7696
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7697
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7698
$as_echo "$ac_ct_CC" >&6; }
7700
- { $as_echo "$as_me:$LINENO: result: no" >&5
7701
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7702
$as_echo "no" >&6; }
7705
@@ -12441,7 +11637,7 @@
7707
case $cross_compiling:$ac_tool_warned in
7709
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7710
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7711
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7712
ac_tool_warned=yes ;;
7714
@@ -12455,9 +11651,9 @@
7715
if test -n "$ac_tool_prefix"; then
7716
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
7717
set dummy ${ac_tool_prefix}cc; ac_word=$2
7718
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7719
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7720
$as_echo_n "checking for $ac_word... " >&6; }
7721
-if test "${ac_cv_prog_CC+set}" = set; then
7722
+if test "${ac_cv_prog_CC+set}" = set; then :
7723
$as_echo_n "(cached) " >&6
7725
if test -n "$CC"; then
7726
@@ -12468,24 +11664,24 @@
7729
test -z "$as_dir" && as_dir=.
7730
- for ac_exec_ext in '' $ac_executable_extensions; do
7731
+ for ac_exec_ext in '' $ac_executable_extensions; do
7732
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7733
ac_cv_prog_CC="${ac_tool_prefix}cc"
7734
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7735
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7746
if test -n "$CC"; then
7747
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7748
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7749
$as_echo "$CC" >&6; }
7751
- { $as_echo "$as_me:$LINENO: result: no" >&5
7752
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7753
$as_echo "no" >&6; }
7756
@@ -12495,9 +11691,9 @@
7757
if test -z "$CC"; then
7758
# Extract the first word of "cc", so it can be a program name with args.
7759
set dummy cc; ac_word=$2
7760
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7761
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7762
$as_echo_n "checking for $ac_word... " >&6; }
7763
-if test "${ac_cv_prog_CC+set}" = set; then
7764
+if test "${ac_cv_prog_CC+set}" = set; then :
7765
$as_echo_n "(cached) " >&6
7767
if test -n "$CC"; then
7768
@@ -12509,18 +11705,18 @@
7771
test -z "$as_dir" && as_dir=.
7772
- for ac_exec_ext in '' $ac_executable_extensions; do
7773
+ for ac_exec_ext in '' $ac_executable_extensions; do
7774
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7775
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
7776
ac_prog_rejected=yes
7780
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7781
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7789
if test $ac_prog_rejected = yes; then
7790
@@ -12539,10 +11735,10 @@
7793
if test -n "$CC"; then
7794
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7795
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7796
$as_echo "$CC" >&6; }
7798
- { $as_echo "$as_me:$LINENO: result: no" >&5
7799
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7800
$as_echo "no" >&6; }
7803
@@ -12554,9 +11750,9 @@
7805
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
7806
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
7807
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7808
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7809
$as_echo_n "checking for $ac_word... " >&6; }
7810
-if test "${ac_cv_prog_CC+set}" = set; then
7811
+if test "${ac_cv_prog_CC+set}" = set; then :
7812
$as_echo_n "(cached) " >&6
7814
if test -n "$CC"; then
7815
@@ -12567,24 +11763,24 @@
7818
test -z "$as_dir" && as_dir=.
7819
- for ac_exec_ext in '' $ac_executable_extensions; do
7820
+ for ac_exec_ext in '' $ac_executable_extensions; do
7821
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7822
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
7823
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7824
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7835
if test -n "$CC"; then
7836
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
7837
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
7838
$as_echo "$CC" >&6; }
7840
- { $as_echo "$as_me:$LINENO: result: no" >&5
7841
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7842
$as_echo "no" >&6; }
7845
@@ -12598,9 +11794,9 @@
7847
# Extract the first word of "$ac_prog", so it can be a program name with args.
7848
set dummy $ac_prog; ac_word=$2
7849
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7850
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7851
$as_echo_n "checking for $ac_word... " >&6; }
7852
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
7853
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
7854
$as_echo_n "(cached) " >&6
7856
if test -n "$ac_ct_CC"; then
7857
@@ -12611,24 +11807,24 @@
7860
test -z "$as_dir" && as_dir=.
7861
- for ac_exec_ext in '' $ac_executable_extensions; do
7862
+ for ac_exec_ext in '' $ac_executable_extensions; do
7863
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7864
ac_cv_prog_ac_ct_CC="$ac_prog"
7865
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7866
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7876
ac_ct_CC=$ac_cv_prog_ac_ct_CC
7877
if test -n "$ac_ct_CC"; then
7878
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
7879
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
7880
$as_echo "$ac_ct_CC" >&6; }
7882
- { $as_echo "$as_me:$LINENO: result: no" >&5
7883
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7884
$as_echo "no" >&6; }
7887
@@ -12641,7 +11837,7 @@
7889
case $cross_compiling:$ac_tool_warned in
7891
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7892
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7893
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7894
ac_tool_warned=yes ;;
7896
@@ -12652,62 +11848,42 @@
7900
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
7901
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7902
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7903
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
7904
-See \`config.log' for more details." >&5
7905
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
7906
-See \`config.log' for more details." >&2;}
7907
- { (exit 1); exit 1; }; }; }
7908
+as_fn_error "no acceptable C compiler found in \$PATH
7909
+See \`config.log' for more details." "$LINENO" 5; }
7911
# Provide some information about the compiler.
7912
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
7913
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
7916
-{ (ac_try="$ac_compiler --version >&5"
7917
-case "(($ac_try" in
7918
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7919
- *) ac_try_echo=$ac_try;;
7921
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7922
-$as_echo "$ac_try_echo") >&5
7923
- (eval "$ac_compiler --version >&5") 2>&5
7925
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7926
- (exit $ac_status); }
7927
-{ (ac_try="$ac_compiler -v >&5"
7928
-case "(($ac_try" in
7929
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7930
- *) ac_try_echo=$ac_try;;
7932
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7933
-$as_echo "$ac_try_echo") >&5
7934
- (eval "$ac_compiler -v >&5") 2>&5
7936
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7937
- (exit $ac_status); }
7938
-{ (ac_try="$ac_compiler -V >&5"
7939
+for ac_option in --version -v -V -qversion; do
7940
+ { { ac_try="$ac_compiler $ac_option >&5"
7942
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7943
*) ac_try_echo=$ac_try;;
7945
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7946
-$as_echo "$ac_try_echo") >&5
7947
- (eval "$ac_compiler -V >&5") 2>&5
7948
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
7949
+$as_echo "$ac_try_echo"; } >&5
7950
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
7952
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7953
- (exit $ac_status); }
7954
+ if test -s conftest.err; then
7956
+... rest of stderr output deleted ...
7957
+ 10q' conftest.err >conftest.er1
7958
+ cat conftest.er1 >&5
7959
+ rm -f conftest.er1 conftest.err
7961
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7962
+ test $ac_status = 0; }
7965
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
7966
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
7967
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
7968
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
7969
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
7970
$as_echo_n "(cached) " >&6
7972
- cat >conftest.$ac_ext <<_ACEOF
7975
-cat confdefs.h >>conftest.$ac_ext
7976
-cat >>conftest.$ac_ext <<_ACEOF
7977
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7978
/* end confdefs.h. */
7981
@@ -12721,37 +11897,16 @@
7985
-rm -f conftest.$ac_objext
7986
-if { (ac_try="$ac_compile"
7987
-case "(($ac_try" in
7988
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7989
- *) ac_try_echo=$ac_try;;
7991
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7992
-$as_echo "$ac_try_echo") >&5
7993
- (eval "$ac_compile") 2>conftest.er1
7995
- grep -v '^ *+' conftest.er1 >conftest.err
7996
- rm -f conftest.er1
7997
- cat conftest.err >&5
7998
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7999
- (exit $ac_status); } && {
8000
- test -z "$ac_c_werror_flag" ||
8001
- test ! -s conftest.err
8002
- } && test -s conftest.$ac_objext; then
8003
+if ac_fn_c_try_compile "$LINENO"; then :
8006
- $as_echo "$as_me: failed program was:" >&5
8007
-sed 's/^/| /' conftest.$ac_ext >&5
8009
- ac_compiler_gnu=no
8010
+ ac_compiler_gnu=no
8013
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8014
ac_cv_c_compiler_gnu=$ac_compiler_gnu
8017
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
8018
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
8019
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
8020
if test $ac_compiler_gnu = yes; then
8022
@@ -12760,20 +11915,16 @@
8024
ac_test_CFLAGS=${CFLAGS+set}
8025
ac_save_CFLAGS=$CFLAGS
8026
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
8027
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
8028
$as_echo_n "checking whether $CC accepts -g... " >&6; }
8029
-if test "${ac_cv_prog_cc_g+set}" = set; then
8030
+if test "${ac_cv_prog_cc_g+set}" = set; then :
8031
$as_echo_n "(cached) " >&6
8033
ac_save_c_werror_flag=$ac_c_werror_flag
8034
ac_c_werror_flag=yes
8037
- cat >conftest.$ac_ext <<_ACEOF
8040
-cat confdefs.h >>conftest.$ac_ext
8041
-cat >>conftest.$ac_ext <<_ACEOF
8042
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8043
/* end confdefs.h. */
8046
@@ -12784,75 +11935,11 @@
8050
-rm -f conftest.$ac_objext
8051
-if { (ac_try="$ac_compile"
8052
-case "(($ac_try" in
8053
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8054
- *) ac_try_echo=$ac_try;;
8056
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8057
-$as_echo "$ac_try_echo") >&5
8058
- (eval "$ac_compile") 2>conftest.er1
8060
- grep -v '^ *+' conftest.er1 >conftest.err
8061
- rm -f conftest.er1
8062
- cat conftest.err >&5
8063
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8064
- (exit $ac_status); } && {
8065
- test -z "$ac_c_werror_flag" ||
8066
- test ! -s conftest.err
8067
- } && test -s conftest.$ac_objext; then
8068
+if ac_fn_c_try_compile "$LINENO"; then :
8071
- $as_echo "$as_me: failed program was:" >&5
8072
-sed 's/^/| /' conftest.$ac_ext >&5
8075
- cat >conftest.$ac_ext <<_ACEOF
8078
-cat confdefs.h >>conftest.$ac_ext
8079
-cat >>conftest.$ac_ext <<_ACEOF
8080
-/* end confdefs.h. */
8090
-rm -f conftest.$ac_objext
8091
-if { (ac_try="$ac_compile"
8092
-case "(($ac_try" in
8093
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8094
- *) ac_try_echo=$ac_try;;
8096
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8097
-$as_echo "$ac_try_echo") >&5
8098
- (eval "$ac_compile") 2>conftest.er1
8100
- grep -v '^ *+' conftest.er1 >conftest.err
8101
- rm -f conftest.er1
8102
- cat conftest.err >&5
8103
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8104
- (exit $ac_status); } && {
8105
- test -z "$ac_c_werror_flag" ||
8106
- test ! -s conftest.err
8107
- } && test -s conftest.$ac_objext; then
8110
- $as_echo "$as_me: failed program was:" >&5
8111
-sed 's/^/| /' conftest.$ac_ext >&5
8113
- ac_c_werror_flag=$ac_save_c_werror_flag
8115
- cat >conftest.$ac_ext <<_ACEOF
8118
-cat confdefs.h >>conftest.$ac_ext
8119
-cat >>conftest.$ac_ext <<_ACEOF
8121
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8122
/* end confdefs.h. */
8125
@@ -12863,42 +11950,33 @@
8129
-rm -f conftest.$ac_objext
8130
-if { (ac_try="$ac_compile"
8131
-case "(($ac_try" in
8132
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8133
- *) ac_try_echo=$ac_try;;
8135
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8136
-$as_echo "$ac_try_echo") >&5
8137
- (eval "$ac_compile") 2>conftest.er1
8139
- grep -v '^ *+' conftest.er1 >conftest.err
8140
- rm -f conftest.er1
8141
- cat conftest.err >&5
8142
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8143
- (exit $ac_status); } && {
8144
- test -z "$ac_c_werror_flag" ||
8145
- test ! -s conftest.err
8146
- } && test -s conftest.$ac_objext; then
8147
- ac_cv_prog_cc_g=yes
8148
+if ac_fn_c_try_compile "$LINENO"; then :
8151
- $as_echo "$as_me: failed program was:" >&5
8152
-sed 's/^/| /' conftest.$ac_ext >&5
8153
+ ac_c_werror_flag=$ac_save_c_werror_flag
8155
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8156
+/* end confdefs.h. */
8166
+if ac_fn_c_try_compile "$LINENO"; then :
8167
+ ac_cv_prog_cc_g=yes
8170
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8173
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8176
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8177
ac_c_werror_flag=$ac_save_c_werror_flag
8179
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
8180
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
8181
$as_echo "$ac_cv_prog_cc_g" >&6; }
8182
if test "$ac_test_CFLAGS" = set; then
8183
CFLAGS=$ac_save_CFLAGS
8184
@@ -12915,18 +11993,14 @@
8188
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
8189
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
8190
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
8191
-if test "${ac_cv_prog_cc_c89+set}" = set; then
8192
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
8193
$as_echo_n "(cached) " >&6
8195
ac_cv_prog_cc_c89=no
8197
-cat >conftest.$ac_ext <<_ACEOF
8200
-cat confdefs.h >>conftest.$ac_ext
8201
-cat >>conftest.$ac_ext <<_ACEOF
8202
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8203
/* end confdefs.h. */
8206
@@ -12983,32 +12057,9 @@
8207
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
8209
CC="$ac_save_CC $ac_arg"
8210
- rm -f conftest.$ac_objext
8211
-if { (ac_try="$ac_compile"
8212
-case "(($ac_try" in
8213
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8214
- *) ac_try_echo=$ac_try;;
8216
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8217
-$as_echo "$ac_try_echo") >&5
8218
- (eval "$ac_compile") 2>conftest.er1
8220
- grep -v '^ *+' conftest.er1 >conftest.err
8221
- rm -f conftest.er1
8222
- cat conftest.err >&5
8223
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8224
- (exit $ac_status); } && {
8225
- test -z "$ac_c_werror_flag" ||
8226
- test ! -s conftest.err
8227
- } && test -s conftest.$ac_objext; then
8228
+ if ac_fn_c_try_compile "$LINENO"; then :
8229
ac_cv_prog_cc_c89=$ac_arg
8231
- $as_echo "$as_me: failed program was:" >&5
8232
-sed 's/^/| /' conftest.$ac_ext >&5
8237
rm -f core conftest.err conftest.$ac_objext
8238
test "x$ac_cv_prog_cc_c89" != "xno" && break
8240
@@ -13019,17 +12070,19 @@
8242
case "x$ac_cv_prog_cc_c89" in
8244
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
8245
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
8246
$as_echo "none needed" >&6; } ;;
8248
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
8249
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
8250
$as_echo "unsupported" >&6; } ;;
8252
CC="$CC $ac_cv_prog_cc_c89"
8253
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
8254
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
8255
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
8257
+if test "x$ac_cv_prog_cc_c89" != xno; then :
8262
ac_cpp='$CPP $CPPFLAGS'
8263
@@ -13039,9 +12092,9 @@
8265
depcc="$CC" am_compiler_list=
8267
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
8268
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
8269
$as_echo_n "checking dependency style of $depcc... " >&6; }
8270
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
8271
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
8272
$as_echo_n "(cached) " >&6
8274
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
8275
@@ -13149,7 +12202,7 @@
8279
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
8280
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
8281
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
8282
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
8284
@@ -13167,16 +12220,12 @@
8072
8286
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
9933
10731
cat >>confdefs.h <<_ACEOF
9934
10732
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9936
@@ -15257,582 +14047,18 @@
9943
-for ac_header in execinfo.h fcntl.h
9945
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9946
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9947
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9948
-$as_echo_n "checking for $ac_header... " >&6; }
9949
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9950
- $as_echo_n "(cached) " >&6
9952
-ac_res=`eval 'as_val=${'$as_ac_Header'}
9953
- $as_echo "$as_val"'`
9954
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9955
-$as_echo "$ac_res" >&6; }
9957
- # Is the header compilable?
9958
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
9959
-$as_echo_n "checking $ac_header usability... " >&6; }
9960
-cat >conftest.$ac_ext <<_ACEOF
9963
-cat confdefs.h >>conftest.$ac_ext
9964
-cat >>conftest.$ac_ext <<_ACEOF
9965
-/* end confdefs.h. */
9966
-$ac_includes_default
9967
-#include <$ac_header>
9969
-rm -f conftest.$ac_objext
9970
-if { (ac_try="$ac_compile"
9971
-case "(($ac_try" in
9972
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9973
- *) ac_try_echo=$ac_try;;
9975
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9976
-$as_echo "$ac_try_echo") >&5
9977
- (eval "$ac_compile") 2>conftest.er1
9979
- grep -v '^ *+' conftest.er1 >conftest.err
9980
- rm -f conftest.er1
9981
- cat conftest.err >&5
9982
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9983
- (exit $ac_status); } && {
9984
- test -z "$ac_c_werror_flag" ||
9985
- test ! -s conftest.err
9986
- } && test -s conftest.$ac_objext; then
9987
- ac_header_compiler=yes
9989
- $as_echo "$as_me: failed program was:" >&5
9990
-sed 's/^/| /' conftest.$ac_ext >&5
9992
- ac_header_compiler=no
9995
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9996
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
9997
-$as_echo "$ac_header_compiler" >&6; }
9999
-# Is the header present?
10000
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
10001
-$as_echo_n "checking $ac_header presence... " >&6; }
10002
-cat >conftest.$ac_ext <<_ACEOF
10005
-cat confdefs.h >>conftest.$ac_ext
10006
-cat >>conftest.$ac_ext <<_ACEOF
10007
-/* end confdefs.h. */
10008
-#include <$ac_header>
10010
-if { (ac_try="$ac_cpp conftest.$ac_ext"
10011
-case "(($ac_try" in
10012
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10013
- *) ac_try_echo=$ac_try;;
10015
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10016
-$as_echo "$ac_try_echo") >&5
10017
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10019
- grep -v '^ *+' conftest.er1 >conftest.err
10020
- rm -f conftest.er1
10021
- cat conftest.err >&5
10022
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10023
- (exit $ac_status); } >/dev/null && {
10024
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
10025
- test ! -s conftest.err
10027
- ac_header_preproc=yes
10029
- $as_echo "$as_me: failed program was:" >&5
10030
-sed 's/^/| /' conftest.$ac_ext >&5
10032
- ac_header_preproc=no
10035
-rm -f conftest.err conftest.$ac_ext
10036
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
10037
-$as_echo "$ac_header_preproc" >&6; }
10039
-# So? What about this header?
10040
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
10042
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
10043
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
10044
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
10045
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
10046
- ac_header_preproc=yes
10049
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
10050
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
10051
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
10052
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
10053
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
10054
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
10055
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
10056
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
10057
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
10058
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
10059
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
10060
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
10062
-## ----------------------------------------------------------------------- ##
10063
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
10064
-## ----------------------------------------------------------------------- ##
10066
- ) | sed "s/^/$as_me: WARNING: /" >&2
10069
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
10070
-$as_echo_n "checking for $ac_header... " >&6; }
10071
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10072
- $as_echo_n "(cached) " >&6
10074
- eval "$as_ac_Header=\$ac_header_preproc"
10076
-ac_res=`eval 'as_val=${'$as_ac_Header'}
10077
- $as_echo "$as_val"'`
10078
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10079
-$as_echo "$ac_res" >&6; }
10082
-as_val=`eval 'as_val=${'$as_ac_Header'}
10083
- $as_echo "$as_val"'`
10084
- if test "x$as_val" = x""yes; then
10085
- cat >>confdefs.h <<_ACEOF
10086
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
10093
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
10094
-$as_echo_n "checking for inline... " >&6; }
10095
-if test "${ac_cv_c_inline+set}" = set; then
10096
- $as_echo_n "(cached) " >&6
10098
- ac_cv_c_inline=no
10099
-for ac_kw in inline __inline__ __inline; do
10100
- cat >conftest.$ac_ext <<_ACEOF
10103
-cat confdefs.h >>conftest.$ac_ext
10104
-cat >>conftest.$ac_ext <<_ACEOF
10105
-/* end confdefs.h. */
10106
-#ifndef __cplusplus
10107
-typedef int foo_t;
10108
-static $ac_kw foo_t static_foo () {return 0; }
10109
-$ac_kw foo_t foo () {return 0; }
10113
-rm -f conftest.$ac_objext
10114
-if { (ac_try="$ac_compile"
10115
-case "(($ac_try" in
10116
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10117
- *) ac_try_echo=$ac_try;;
10119
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10120
-$as_echo "$ac_try_echo") >&5
10121
- (eval "$ac_compile") 2>conftest.er1
10123
- grep -v '^ *+' conftest.er1 >conftest.err
10124
- rm -f conftest.er1
10125
- cat conftest.err >&5
10126
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10127
- (exit $ac_status); } && {
10128
- test -z "$ac_c_werror_flag" ||
10129
- test ! -s conftest.err
10130
- } && test -s conftest.$ac_objext; then
10131
- ac_cv_c_inline=$ac_kw
10133
- $as_echo "$as_me: failed program was:" >&5
10134
-sed 's/^/| /' conftest.$ac_ext >&5
10139
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10140
- test "$ac_cv_c_inline" != no && break
10144
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
10145
-$as_echo "$ac_cv_c_inline" >&6; }
10148
-case $ac_cv_c_inline in
10151
- case $ac_cv_c_inline in
10153
- *) ac_val=$ac_cv_c_inline;;
10155
- cat >>confdefs.h <<_ACEOF
10156
-#ifndef __cplusplus
10157
-#define inline $ac_val
10163
-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
10164
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
10165
-if test "${ac_cv_header_time+set}" = set; then
10166
- $as_echo_n "(cached) " >&6
10168
- cat >conftest.$ac_ext <<_ACEOF
10171
-cat confdefs.h >>conftest.$ac_ext
10172
-cat >>conftest.$ac_ext <<_ACEOF
10173
-/* end confdefs.h. */
10174
-#include <sys/types.h>
10175
-#include <sys/time.h>
10181
-if ((struct tm *) 0)
10187
-rm -f conftest.$ac_objext
10188
-if { (ac_try="$ac_compile"
10189
-case "(($ac_try" in
10190
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10191
- *) ac_try_echo=$ac_try;;
10193
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10194
-$as_echo "$ac_try_echo") >&5
10195
- (eval "$ac_compile") 2>conftest.er1
10197
- grep -v '^ *+' conftest.er1 >conftest.err
10198
- rm -f conftest.er1
10199
- cat conftest.err >&5
10200
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10201
- (exit $ac_status); } && {
10202
- test -z "$ac_c_werror_flag" ||
10203
- test ! -s conftest.err
10204
- } && test -s conftest.$ac_objext; then
10205
- ac_cv_header_time=yes
10207
- $as_echo "$as_me: failed program was:" >&5
10208
-sed 's/^/| /' conftest.$ac_ext >&5
10210
- ac_cv_header_time=no
10213
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10215
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
10216
-$as_echo "$ac_cv_header_time" >&6; }
10217
-if test $ac_cv_header_time = yes; then
10219
-cat >>confdefs.h <<\_ACEOF
10220
-#define TIME_WITH_SYS_TIME 1
10229
-for ac_header in $ac_header_list
10231
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
10232
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10233
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
10234
-$as_echo_n "checking for $ac_header... " >&6; }
10235
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10236
- $as_echo_n "(cached) " >&6
10238
-ac_res=`eval 'as_val=${'$as_ac_Header'}
10239
- $as_echo "$as_val"'`
10240
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10241
-$as_echo "$ac_res" >&6; }
10243
- # Is the header compilable?
10244
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
10245
-$as_echo_n "checking $ac_header usability... " >&6; }
10246
-cat >conftest.$ac_ext <<_ACEOF
10249
-cat confdefs.h >>conftest.$ac_ext
10250
-cat >>conftest.$ac_ext <<_ACEOF
10251
-/* end confdefs.h. */
10252
-$ac_includes_default
10253
-#include <$ac_header>
10255
-rm -f conftest.$ac_objext
10256
-if { (ac_try="$ac_compile"
10257
-case "(($ac_try" in
10258
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10259
- *) ac_try_echo=$ac_try;;
10261
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10262
-$as_echo "$ac_try_echo") >&5
10263
- (eval "$ac_compile") 2>conftest.er1
10265
- grep -v '^ *+' conftest.er1 >conftest.err
10266
- rm -f conftest.er1
10267
- cat conftest.err >&5
10268
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10269
- (exit $ac_status); } && {
10270
- test -z "$ac_c_werror_flag" ||
10271
- test ! -s conftest.err
10272
- } && test -s conftest.$ac_objext; then
10273
- ac_header_compiler=yes
10275
- $as_echo "$as_me: failed program was:" >&5
10276
-sed 's/^/| /' conftest.$ac_ext >&5
10278
- ac_header_compiler=no
10281
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10282
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
10283
-$as_echo "$ac_header_compiler" >&6; }
10285
-# Is the header present?
10286
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
10287
-$as_echo_n "checking $ac_header presence... " >&6; }
10288
-cat >conftest.$ac_ext <<_ACEOF
10291
-cat confdefs.h >>conftest.$ac_ext
10292
-cat >>conftest.$ac_ext <<_ACEOF
10293
-/* end confdefs.h. */
10294
-#include <$ac_header>
10296
-if { (ac_try="$ac_cpp conftest.$ac_ext"
10297
-case "(($ac_try" in
10298
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10299
- *) ac_try_echo=$ac_try;;
10301
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10302
-$as_echo "$ac_try_echo") >&5
10303
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10305
- grep -v '^ *+' conftest.er1 >conftest.err
10306
- rm -f conftest.er1
10307
- cat conftest.err >&5
10308
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10309
- (exit $ac_status); } >/dev/null && {
10310
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
10311
- test ! -s conftest.err
10313
- ac_header_preproc=yes
10315
- $as_echo "$as_me: failed program was:" >&5
10316
-sed 's/^/| /' conftest.$ac_ext >&5
10318
- ac_header_preproc=no
10321
-rm -f conftest.err conftest.$ac_ext
10322
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
10323
-$as_echo "$ac_header_preproc" >&6; }
10325
-# So? What about this header?
10326
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
10328
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
10329
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
10330
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
10331
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
10332
- ac_header_preproc=yes
10335
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
10336
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
10337
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
10338
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
10339
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
10340
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
10341
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
10342
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
10343
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
10344
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
10345
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
10346
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
10348
-## ----------------------------------------------------------------------- ##
10349
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany ##
10350
-## ----------------------------------------------------------------------- ##
10352
- ) | sed "s/^/$as_me: WARNING: /" >&2
10355
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
10356
-$as_echo_n "checking for $ac_header... " >&6; }
10357
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10358
- $as_echo_n "(cached) " >&6
10360
- eval "$as_ac_Header=\$ac_header_preproc"
10362
-ac_res=`eval 'as_val=${'$as_ac_Header'}
10363
- $as_echo "$as_val"'`
10364
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10365
-$as_echo "$ac_res" >&6; }
10368
-as_val=`eval 'as_val=${'$as_ac_Header'}
10369
- $as_echo "$as_val"'`
10370
- if test "x$as_val" = x""yes; then
10371
- cat >>confdefs.h <<_ACEOF
10372
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
10387
-for ac_func in $ac_func_list
10389
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
10390
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
10391
-$as_echo_n "checking for $ac_func... " >&6; }
10392
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
10393
- $as_echo_n "(cached) " >&6
10395
- cat >conftest.$ac_ext <<_ACEOF
10398
-cat confdefs.h >>conftest.$ac_ext
10399
-cat >>conftest.$ac_ext <<_ACEOF
10400
-/* end confdefs.h. */
10401
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
10402
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
10403
-#define $ac_func innocuous_$ac_func
10405
-/* System header to define __stub macros and hopefully few prototypes,
10406
- which can conflict with char $ac_func (); below.
10407
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
10408
- <limits.h> exists even on freestanding compilers. */
10411
-# include <limits.h>
10413
-# include <assert.h>
10418
-/* Override any GCC internal prototype to avoid an error.
10419
- Use char because int might match the return type of a GCC
10420
- builtin and then its argument prototype would still apply. */
10421
-#ifdef __cplusplus
10425
-/* The GNU C library defines this for functions which it implements
10426
- to always fail with ENOSYS. Some functions are actually named
10427
- something starting with __ and the normal name is an alias. */
10428
-#if defined __stub_$ac_func || defined __stub___$ac_func
10435
-return $ac_func ();
10440
-rm -f conftest.$ac_objext conftest$ac_exeext
10441
-if { (ac_try="$ac_link"
10442
-case "(($ac_try" in
10443
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10444
- *) ac_try_echo=$ac_try;;
10446
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10447
-$as_echo "$ac_try_echo") >&5
10448
- (eval "$ac_link") 2>conftest.er1
10450
- grep -v '^ *+' conftest.er1 >conftest.err
10451
- rm -f conftest.er1
10452
- cat conftest.err >&5
10453
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10454
- (exit $ac_status); } && {
10455
- test -z "$ac_c_werror_flag" ||
10456
- test ! -s conftest.err
10457
- } && test -s conftest$ac_exeext && {
10458
- test "$cross_compiling" = yes ||
10459
- $as_test_x conftest$ac_exeext
10461
- eval "$as_ac_var=yes"
10463
- $as_echo "$as_me: failed program was:" >&5
10464
-sed 's/^/| /' conftest.$ac_ext >&5
10466
- eval "$as_ac_var=no"
10469
-rm -rf conftest.dSYM
10470
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10471
- conftest$ac_exeext conftest.$ac_ext
10473
-ac_res=`eval 'as_val=${'$as_ac_var'}
10474
- $as_echo "$as_val"'`
10475
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10476
-$as_echo "$ac_res" >&6; }
10477
-as_val=`eval 'as_val=${'$as_ac_var'}
10478
- $as_echo "$as_val"'`
10479
- if test "x$as_val" = x""yes; then
10480
- cat >>confdefs.h <<_ACEOF
10481
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
10734
@@ -15607,31 +13936,15 @@
15003
15295
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
15006
Index: epiphany-browser-2.28.0/lib/Makefile.in
15007
===================================================================
15008
--- epiphany-browser-2.28.0.orig/lib/Makefile.in 2009-09-24 18:15:07.380440552 -0300
15009
+++ epiphany-browser-2.28.0/lib/Makefile.in 2009-09-24 18:20:09.016939583 -0300
15010
@@ -336,6 +336,7 @@
15011
PACKAGE_NAME = @PACKAGE_NAME@
15012
PACKAGE_STRING = @PACKAGE_STRING@
15013
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15014
+PACKAGE_URL = @PACKAGE_URL@
15015
PACKAGE_VERSION = @PACKAGE_VERSION@
15016
PATH_SEPARATOR = @PATH_SEPARATOR@
15017
PKG_CONFIG = @PKG_CONFIG@
15018
@@ -467,7 +468,7 @@
15298
Index: epiphany-browser-2.29.1/data/art/Makefile.in
15299
===================================================================
15300
--- epiphany-browser-2.29.1.orig/data/art/Makefile.in 2009-10-26 17:15:28.000000000 -0200
15301
+++ epiphany-browser-2.29.1/data/art/Makefile.in 2009-10-30 10:55:31.468302394 -0200
15302
@@ -142,8 +142,6 @@
15303
GMSGFMT = @GMSGFMT@
15305
GTKDOC_CHECK = @GTKDOC_CHECK@
15306
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15307
-GTKDOC_REBASE = @GTKDOC_REBASE@
15308
G_IR_COMPILER = @G_IR_COMPILER@
15309
G_IR_GENERATE = @G_IR_GENERATE@
15310
G_IR_SCANNER = @G_IR_SCANNER@
15311
@@ -156,29 +154,10 @@
15312
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15313
INSTOBJEXT = @INSTOBJEXT@
15314
INTLLIBS = @INTLLIBS@
15315
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15316
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15317
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15318
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15319
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15320
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15321
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15322
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15323
INTLTOOL_PERL = @INTLTOOL_PERL@
15324
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15325
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15326
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15327
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15328
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15329
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15330
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15331
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15332
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15333
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15334
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15335
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15336
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15337
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15338
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15339
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15341
@@ -213,6 +192,7 @@
15342
PACKAGE_NAME = @PACKAGE_NAME@
15343
PACKAGE_STRING = @PACKAGE_STRING@
15344
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15345
+PACKAGE_URL = @PACKAGE_URL@
15346
PACKAGE_VERSION = @PACKAGE_VERSION@
15347
PATH_SEPARATOR = @PATH_SEPARATOR@
15348
PKG_CONFIG = @PKG_CONFIG@
15349
Index: epiphany-browser-2.29.1/data/glade/Makefile.in
15350
===================================================================
15351
--- epiphany-browser-2.29.1.orig/data/glade/Makefile.in 2009-10-26 17:33:18.000000000 -0200
15352
+++ epiphany-browser-2.29.1/data/glade/Makefile.in 2009-10-30 10:55:31.540298438 -0200
15353
@@ -142,8 +142,6 @@
15354
GMSGFMT = @GMSGFMT@
15356
GTKDOC_CHECK = @GTKDOC_CHECK@
15357
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15358
-GTKDOC_REBASE = @GTKDOC_REBASE@
15359
G_IR_COMPILER = @G_IR_COMPILER@
15360
G_IR_GENERATE = @G_IR_GENERATE@
15361
G_IR_SCANNER = @G_IR_SCANNER@
15362
@@ -156,29 +154,10 @@
15363
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15364
INSTOBJEXT = @INSTOBJEXT@
15365
INTLLIBS = @INTLLIBS@
15366
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15367
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15368
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15369
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15370
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15371
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15372
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15373
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15374
INTLTOOL_PERL = @INTLTOOL_PERL@
15375
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15376
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15377
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15378
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15379
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15380
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15381
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15382
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15383
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15384
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15385
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15386
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15387
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15388
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15389
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15390
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15392
@@ -213,6 +192,7 @@
15393
PACKAGE_NAME = @PACKAGE_NAME@
15394
PACKAGE_STRING = @PACKAGE_STRING@
15395
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15396
+PACKAGE_URL = @PACKAGE_URL@
15397
PACKAGE_VERSION = @PACKAGE_VERSION@
15398
PATH_SEPARATOR = @PATH_SEPARATOR@
15399
PKG_CONFIG = @PKG_CONFIG@
15400
Index: epiphany-browser-2.29.1/data/icons/Makefile.in
15401
===================================================================
15402
--- epiphany-browser-2.29.1.orig/data/icons/Makefile.in 2009-10-26 17:15:29.000000000 -0200
15403
+++ epiphany-browser-2.29.1/data/icons/Makefile.in 2009-10-30 10:55:31.616298083 -0200
15404
@@ -120,8 +120,6 @@
15405
GMSGFMT = @GMSGFMT@
15407
GTKDOC_CHECK = @GTKDOC_CHECK@
15408
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15409
-GTKDOC_REBASE = @GTKDOC_REBASE@
15410
G_IR_COMPILER = @G_IR_COMPILER@
15411
G_IR_GENERATE = @G_IR_GENERATE@
15412
G_IR_SCANNER = @G_IR_SCANNER@
15413
@@ -134,29 +132,10 @@
15414
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15415
INSTOBJEXT = @INSTOBJEXT@
15416
INTLLIBS = @INTLLIBS@
15417
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15418
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15419
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15420
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15421
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15422
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15423
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15424
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15425
INTLTOOL_PERL = @INTLTOOL_PERL@
15426
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15427
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15428
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15429
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15430
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15431
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15432
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15433
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15434
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15435
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15436
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15437
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15438
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15439
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15440
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15441
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15443
@@ -191,6 +170,7 @@
15444
PACKAGE_NAME = @PACKAGE_NAME@
15445
PACKAGE_STRING = @PACKAGE_STRING@
15446
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15447
+PACKAGE_URL = @PACKAGE_URL@
15448
PACKAGE_VERSION = @PACKAGE_VERSION@
15449
PATH_SEPARATOR = @PATH_SEPARATOR@
15450
PKG_CONFIG = @PKG_CONFIG@
15451
Index: epiphany-browser-2.29.1/data/Makefile.in
15452
===================================================================
15453
--- epiphany-browser-2.29.1.orig/data/Makefile.in 2009-10-26 17:15:28.000000000 -0200
15454
+++ epiphany-browser-2.29.1/data/Makefile.in 2009-10-30 10:55:31.392298692 -0200
15455
@@ -192,8 +192,6 @@
15456
GMSGFMT = @GMSGFMT@
15458
GTKDOC_CHECK = @GTKDOC_CHECK@
15459
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15460
-GTKDOC_REBASE = @GTKDOC_REBASE@
15461
G_IR_COMPILER = @G_IR_COMPILER@
15462
G_IR_GENERATE = @G_IR_GENERATE@
15463
G_IR_SCANNER = @G_IR_SCANNER@
15464
@@ -206,29 +204,10 @@
15465
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15466
INSTOBJEXT = @INSTOBJEXT@
15467
INTLLIBS = @INTLLIBS@
15468
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15469
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15470
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15471
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15472
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15473
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15474
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15475
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15476
INTLTOOL_PERL = @INTLTOOL_PERL@
15477
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15478
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15479
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15480
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15481
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15482
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15483
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15484
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15485
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15486
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15487
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15488
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15489
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15490
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15491
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15492
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15494
@@ -263,6 +242,7 @@
15495
PACKAGE_NAME = @PACKAGE_NAME@
15496
PACKAGE_STRING = @PACKAGE_STRING@
15497
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15498
+PACKAGE_URL = @PACKAGE_URL@
15499
PACKAGE_VERSION = @PACKAGE_VERSION@
15500
PATH_SEPARATOR = @PATH_SEPARATOR@
15501
PKG_CONFIG = @PKG_CONFIG@
15502
Index: epiphany-browser-2.29.1/data/ui/Makefile.in
15503
===================================================================
15504
--- epiphany-browser-2.29.1.orig/data/ui/Makefile.in 2009-10-26 17:15:29.000000000 -0200
15505
+++ epiphany-browser-2.29.1/data/ui/Makefile.in 2009-10-30 10:55:31.688298027 -0200
15506
@@ -142,8 +142,6 @@
15507
GMSGFMT = @GMSGFMT@
15509
GTKDOC_CHECK = @GTKDOC_CHECK@
15510
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15511
-GTKDOC_REBASE = @GTKDOC_REBASE@
15512
G_IR_COMPILER = @G_IR_COMPILER@
15513
G_IR_GENERATE = @G_IR_GENERATE@
15514
G_IR_SCANNER = @G_IR_SCANNER@
15515
@@ -156,29 +154,10 @@
15516
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15517
INSTOBJEXT = @INSTOBJEXT@
15518
INTLLIBS = @INTLLIBS@
15519
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15520
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15521
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15522
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15523
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15524
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15525
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15526
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15527
INTLTOOL_PERL = @INTLTOOL_PERL@
15528
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15529
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15530
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15531
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15532
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15533
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15534
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15535
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15536
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15537
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15538
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15539
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15540
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15541
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15542
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15543
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15545
@@ -213,6 +192,7 @@
15546
PACKAGE_NAME = @PACKAGE_NAME@
15547
PACKAGE_STRING = @PACKAGE_STRING@
15548
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15549
+PACKAGE_URL = @PACKAGE_URL@
15550
PACKAGE_VERSION = @PACKAGE_VERSION@
15551
PATH_SEPARATOR = @PATH_SEPARATOR@
15552
PKG_CONFIG = @PKG_CONFIG@
15553
Index: epiphany-browser-2.29.1/doc/Makefile.in
15554
===================================================================
15555
--- epiphany-browser-2.29.1.orig/doc/Makefile.in 2009-10-26 17:15:29.000000000 -0200
15556
+++ epiphany-browser-2.29.1/doc/Makefile.in 2009-10-30 10:55:31.768298129 -0200
15557
@@ -183,8 +183,6 @@
15558
GMSGFMT = @GMSGFMT@
15560
GTKDOC_CHECK = @GTKDOC_CHECK@
15561
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15562
-GTKDOC_REBASE = @GTKDOC_REBASE@
15563
G_IR_COMPILER = @G_IR_COMPILER@
15564
G_IR_GENERATE = @G_IR_GENERATE@
15565
G_IR_SCANNER = @G_IR_SCANNER@
15566
@@ -197,29 +195,10 @@
15567
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15568
INSTOBJEXT = @INSTOBJEXT@
15569
INTLLIBS = @INTLLIBS@
15570
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15571
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15572
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15573
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15574
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15575
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15576
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15577
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15578
INTLTOOL_PERL = @INTLTOOL_PERL@
15579
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15580
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15581
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15582
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15583
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15584
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15585
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15586
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15587
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15588
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15589
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15590
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15591
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15592
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15593
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15594
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15596
@@ -254,6 +233,7 @@
15597
PACKAGE_NAME = @PACKAGE_NAME@
15598
PACKAGE_STRING = @PACKAGE_STRING@
15599
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15600
+PACKAGE_URL = @PACKAGE_URL@
15601
PACKAGE_VERSION = @PACKAGE_VERSION@
15602
PATH_SEPARATOR = @PATH_SEPARATOR@
15603
PKG_CONFIG = @PKG_CONFIG@
15604
Index: epiphany-browser-2.29.1/doc/reference/Makefile.in
15605
===================================================================
15606
--- epiphany-browser-2.29.1.orig/doc/reference/Makefile.in 2009-10-26 17:15:29.000000000 -0200
15607
+++ epiphany-browser-2.29.1/doc/reference/Makefile.in 2009-10-30 10:55:31.856299587 -0200
15608
@@ -121,8 +121,6 @@
15609
GMSGFMT = @GMSGFMT@
15611
GTKDOC_CHECK = @GTKDOC_CHECK@
15612
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15613
-GTKDOC_REBASE = @GTKDOC_REBASE@
15614
G_IR_COMPILER = @G_IR_COMPILER@
15615
G_IR_GENERATE = @G_IR_GENERATE@
15616
G_IR_SCANNER = @G_IR_SCANNER@
15617
@@ -135,29 +133,10 @@
15618
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15619
INSTOBJEXT = @INSTOBJEXT@
15620
INTLLIBS = @INTLLIBS@
15621
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15622
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15623
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15624
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15625
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15626
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15627
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15628
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15629
INTLTOOL_PERL = @INTLTOOL_PERL@
15630
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15631
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15632
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15633
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15634
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15635
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15636
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15637
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15638
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15639
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15640
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15641
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15642
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15643
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15644
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15645
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15647
@@ -192,6 +171,7 @@
15648
PACKAGE_NAME = @PACKAGE_NAME@
15649
PACKAGE_STRING = @PACKAGE_STRING@
15650
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15651
+PACKAGE_URL = @PACKAGE_URL@
15652
PACKAGE_VERSION = @PACKAGE_VERSION@
15653
PATH_SEPARATOR = @PATH_SEPARATOR@
15654
PKG_CONFIG = @PKG_CONFIG@
15655
Index: epiphany-browser-2.29.1/embed/Makefile.in
15656
===================================================================
15657
--- epiphany-browser-2.29.1.orig/embed/Makefile.in 2009-10-26 17:15:29.000000000 -0200
15658
+++ epiphany-browser-2.29.1/embed/Makefile.in 2009-10-30 10:55:32.064298943 -0200
15659
@@ -197,8 +197,6 @@
15660
GMSGFMT = @GMSGFMT@
15662
GTKDOC_CHECK = @GTKDOC_CHECK@
15663
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
15664
-GTKDOC_REBASE = @GTKDOC_REBASE@
15665
G_IR_COMPILER = @G_IR_COMPILER@
15666
G_IR_GENERATE = @G_IR_GENERATE@
15667
G_IR_SCANNER = @G_IR_SCANNER@
15668
@@ -211,29 +209,10 @@
15669
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
15670
INSTOBJEXT = @INSTOBJEXT@
15671
INTLLIBS = @INTLLIBS@
15672
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
15673
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
15674
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
15675
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
15676
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
15677
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
15678
INTLTOOL_MERGE = @INTLTOOL_MERGE@
15679
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
15680
INTLTOOL_PERL = @INTLTOOL_PERL@
15681
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
15682
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
15683
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
15684
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
15685
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
15686
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
15687
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
15688
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
15689
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
15690
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
15691
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
15692
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
15693
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
15694
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
15695
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
15696
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
15698
@@ -268,6 +247,7 @@
15699
PACKAGE_NAME = @PACKAGE_NAME@
15700
PACKAGE_STRING = @PACKAGE_STRING@
15701
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15702
+PACKAGE_URL = @PACKAGE_URL@
15703
PACKAGE_VERSION = @PACKAGE_VERSION@
15704
PATH_SEPARATOR = @PATH_SEPARATOR@
15705
PKG_CONFIG = @PKG_CONFIG@
15706
Index: epiphany-browser-2.29.1/gnome-doc-utils.make
15707
===================================================================
15708
--- epiphany-browser-2.29.1.orig/gnome-doc-utils.make 2009-10-22 13:24:10.000000000 -0200
15709
+++ epiphany-browser-2.29.1/gnome-doc-utils.make 2009-10-30 10:55:17.332304166 -0200
15711
## The name of the document being built
15715
+## The unique identifier for a Mallard document
15719
+## Page files in a Mallard document
15723
## Files included with a SYSTEM entity
15725
@@ -123,9 +131,11 @@
15726
## Variables for Bootstrapping
15728
_xml2po ?= `which xml2po`
15729
+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
15731
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
15732
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
15733
+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
15734
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
15735
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
15736
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
15737
@@ -205,6 +215,10 @@
15738
## The top-level documentation file in the C locale
15739
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
15742
+## Page files in a Mallard document in the C locale
15743
+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
15745
## @ _DOC_C_ENTITIES
15746
## Files included with a SYSTEM entity in the C locale
15747
_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
15748
@@ -217,13 +231,14 @@
15749
## All documentation files in the C locale
15751
$(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
15753
+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
15755
## @ _DOC_C_DOCS_NOENT
15756
## All documentation files in the C locale,
15757
## except files included with a SYSTEM entity
15758
_DOC_C_DOCS_NOENT = \
15759
- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
15760
+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
15763
## @ _DOC_C_FIGURES
15764
## All figures and other external data in the C locale
15765
@@ -245,7 +260,7 @@
15768
## The .po files used for translating the document
15769
-_DOC_POFILES = $(if $(DOC_MODULE), \
15770
+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
15771
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
15774
@@ -256,6 +271,12 @@
15775
_DOC_LC_MODULES = $(if $(DOC_MODULE), \
15776
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
15778
+## @ _DOC_LC_PAGES
15779
+## Page files in a Mallard document in all other locales
15781
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
15782
+ $(lc)/$(notdir $(page)) ))
15784
## @ _DOC_LC_XINCLUDES
15785
## Files included with XInclude in all other locales
15786
_DOC_LC_INCLUDES = \
15787
@@ -272,7 +293,7 @@
15789
## All documentation files in all other locales
15791
- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
15792
+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
15793
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
15795
## @ _DOC_LC_FIGURES
15796
@@ -299,16 +320,16 @@
15798
if ! test -f $@; then \
15799
echo "(cd $(dir $@) && \
15800
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
15801
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
15802
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
15804
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
15805
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
15806
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
15808
echo "(cd $(dir $@) && \
15809
- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
15810
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
15812
- $(_xml2po) -e -u $(notdir $@) $$docs); \
15813
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
15816
# FIXME: fix the dependancy
15817
@@ -317,9 +338,10 @@
15818
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
15819
if ! test -d $(dir $@); then mkdir $(dir $@); fi
15820
if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
15821
+ po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
15822
+ if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
15824
- $(_xml2po) -e -p \
15825
- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
15826
+ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
15827
"$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
15828
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
15830
@@ -329,7 +351,7 @@
15833
$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
15834
- $(_xml2po) -e -o $@ $^
15835
+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
15838
################################################################################
15839
@@ -347,6 +369,7 @@
15842
################################################################################
15846
$(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
15847
@@ -354,6 +377,9 @@
15848
$(_DOC_HTML_ALL) $(_DOC_POFILES)
15851
+################################################################################
15854
.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
15856
clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
15857
@@ -372,7 +398,7 @@
15858
rm -f "$$lc/.xml2po.mo"; \
15862
+clean-doc-dir: clean-doc-lc
15863
@for lc in C $(_DOC_REAL_LINGUAS); do \
15864
for dir in `find $$lc -depth -type d`; do \
15865
if ! test $$dir -ef $(srcdir)/$$dir; then \
15866
@@ -385,7 +411,7 @@
15867
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
15868
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
15869
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
15870
-_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
15871
+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
15874
$(_clean_omf) $(_clean_dsk) \
15875
@@ -401,10 +427,14 @@
15876
$(_clean_lc) $(_clean_dir)
15879
-.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
15881
- $(if $(DOC_MODULE),dist-doc-docs) \
15882
- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
15884
+################################################################################
15887
+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
15889
+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
15890
+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
15891
$(if $(_DOC_OMF_IN),dist-doc-omf)
15892
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
15894
@@ -451,9 +481,14 @@
15895
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
15899
+################################################################################
15902
.PHONY: check-doc-docs check-doc-omf
15904
$(if $(DOC_MODULE),check-doc-docs) \
15905
+ $(if $(DOC_ID),check-doc-pages) \
15906
$(if $(_DOC_OMF_IN),check-doc-omf)
15908
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
15909
@@ -469,6 +504,21 @@
15910
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
15913
+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
15914
+ for lc in C $(_DOC_REAL_LINGUAS); do \
15915
+ if test -f "$$lc"; \
15917
+ xmlpath="$$lc"; \
15919
+ d="$(srcdir)/"; \
15920
+ xmlpath="$$lc:$(srcdir)/$$lc"; \
15922
+ for page in $(DOC_PAGES); do \
15923
+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
15924
+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
15928
check-doc-omf: $(_DOC_OMF_ALL)
15929
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
15930
echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
15931
@@ -476,9 +526,16 @@
15936
+################################################################################
15939
.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
15941
+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
15943
install-data-local: \
15944
- $(if $(DOC_MODULE),install-doc-docs) \
15945
+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
15946
$(if $(_DOC_HTML_ALL),install-doc-html) \
15947
$(if $(_DOC_C_FIGURES),install-doc-figs) \
15948
$(if $(_DOC_OMF_IN),install-doc-omf)
15949
@@ -486,42 +543,46 @@
15952
@for lc in C $(_DOC_REAL_LINGUAS); do \
15953
- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
15954
- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
15955
+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
15956
+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
15958
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
15959
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
15960
docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
15961
- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
15962
+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
15963
if ! test -d "$$docdir"; then \
15964
echo "$(mkinstalldirs) $$docdir"; \
15965
$(mkinstalldirs) "$$docdir"; \
15967
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
15968
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
15969
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
15970
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
15974
@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
15975
for lc in C $(_DOC_REAL_LINGUAS); do \
15976
+ figsymlink=false; \
15977
if test -f "$$lc/$$fig"; then \
15978
figfile="$$lc/$$fig"; \
15979
elif test -f "$(srcdir)/$$lc/$$fig"; then \
15980
figfile="$(srcdir)/$$lc/$$fig"; \
15981
- elif test -f "C/$$fig"; then \
15982
- figfile="C/$$fig"; \
15984
- figfile="$(srcdir)/C/$$fig"; \
15985
+ figsymlink=true; \
15987
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
15988
- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
15989
+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
15990
if ! test -d "$$figdir"; then \
15991
echo "$(mkinstalldirs) $$figdir"; \
15992
$(mkinstalldirs) "$$figdir"; \
15994
figbase=`echo $$fig | sed -e 's/^.*\///'`; \
15995
- echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
15996
- $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
15997
+ if $$figsymlink; then \
15998
+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
15999
+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
16001
+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
16002
+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
16007
@@ -529,23 +590,27 @@
16011
- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
16012
+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
16013
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
16014
- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16015
- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
16016
+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16017
+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
16019
@if test "x$(_ENABLE_SK)" = "xtrue"; then \
16020
- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
16021
- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
16022
+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
16023
+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
16031
+################################################################################
16034
.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
16036
- $(if $(DOC_MODULE),uninstall-doc-docs) \
16037
+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
16038
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
16039
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
16040
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
16041
@@ -553,22 +618,22 @@
16043
uninstall-doc-docs:
16044
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
16045
- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
16046
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
16047
+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
16048
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
16051
uninstall-doc-figs:
16052
@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
16053
- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
16054
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
16055
+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
16056
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
16060
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
16061
if test "x$(_ENABLE_SK)" = "xtrue"; then \
16062
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16063
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16064
+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16065
+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16067
- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16068
- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16069
+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16070
+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16072
Index: epiphany-browser-2.29.1/gtk-doc.make
16073
===================================================================
16074
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
16075
+++ epiphany-browser-2.29.1/gtk-doc.make 2009-10-30 10:55:17.332304166 -0200
16077
+# -*- mode: makefile -*-
16079
+####################################
16080
+# Everything below here is generic #
16081
+####################################
16083
+if GTK_DOC_USE_LIBTOOL
16084
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
16085
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
16086
+GTKDOC_RUN = $(LIBTOOL) --mode=execute
16088
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
16089
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
16090
+GTKDOC_RUN = sh -c
16093
+# We set GPATH here; this gives us semantics for GNU make
16094
+# which are more like other make's VPATH, when it comes to
16095
+# whether a source that is a target of one rule is then
16096
+# searched for in VPATH/GPATH.
16100
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
16103
+ $(content_files) \
16105
+ $(DOC_MAIN_SGML_FILE) \
16106
+ $(DOC_MODULE)-sections.txt \
16107
+ $(DOC_MODULE)-overrides.txt
16109
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
16110
+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
16113
+ $(DOC_MODULE).args \
16114
+ $(DOC_MODULE).hierarchy \
16115
+ $(DOC_MODULE).interfaces \
16116
+ $(DOC_MODULE).prerequisites \
16117
+ $(DOC_MODULE).signals
16120
+ $(DOC_MODULE)-undocumented.txt \
16121
+ $(DOC_MODULE)-undeclared.txt \
16122
+ $(DOC_MODULE)-unused.txt
16124
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
16127
+all-local: html-build.stamp
16132
+docs: html-build.stamp
16134
+$(REPORT_FILES): sgml-build.stamp
16138
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
16139
+ @echo 'gtk-doc: Scanning header files'
16140
+ @-chmod -R u+w $(srcdir)
16141
+ cd $(srcdir) && \
16142
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
16143
+ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
16144
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
16147
+ for i in $(SCANOBJ_FILES) ; do \
16148
+ test -f $$i || touch $$i ; \
16151
+ touch scan-build.stamp
16153
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
16156
+#### templates ####
16158
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
16159
+ @echo 'gtk-doc: Rebuilding template files'
16160
+ @-chmod -R u+w $(srcdir)
16161
+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
16162
+ touch tmpl-build.stamp
16164
+tmpl.stamp: tmpl-build.stamp
16173
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
16174
+ @echo 'gtk-doc: Building XML'
16175
+ @-chmod -R u+w $(srcdir)
16176
+ cd $(srcdir) && \
16177
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
16178
+ touch sgml-build.stamp
16180
+sgml.stamp: sgml-build.stamp
16185
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
16186
+ @echo 'gtk-doc: Building HTML'
16187
+ @-chmod -R u+w $(srcdir)
16188
+ rm -rf $(srcdir)/html
16189
+ mkdir $(srcdir)/html
16190
+ mkhtml_options=""; \
16191
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
16192
+ if test "$(?)" = "0"; then \
16193
+ mkhtml_options=--path="$(srcdir)"; \
16195
+ cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
16196
+ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
16197
+ @echo 'gtk-doc: Fixing cross-references'
16198
+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
16199
+ touch html-build.stamp
16208
+ cd $(srcdir) && \
16209
+ rm -rf xml $(REPORT_FILES) \
16210
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
16212
+maintainer-clean-local: clean
16213
+ cd $(srcdir) && rm -rf xml html
16215
+install-data-local:
16216
+ installfiles=`echo $(srcdir)/html/*`; \
16217
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
16218
+ then echo '-- Nothing to install' ; \
16220
+ if test -n "$(DOC_MODULE_VERSION)"; then \
16221
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
16223
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
16225
+ $(mkinstalldirs) $${installdir} ; \
16226
+ for i in $$installfiles; do \
16227
+ echo '-- Installing '$$i ; \
16228
+ $(INSTALL_DATA) $$i $${installdir}; \
16230
+ if test -n "$(DOC_MODULE_VERSION)"; then \
16231
+ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
16232
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
16233
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
16234
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
16236
+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
16237
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
16241
+ if test -n "$(DOC_MODULE_VERSION)"; then \
16242
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
16244
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
16246
+ rm -rf $${installdir}
16249
+# Require gtk-doc when making dist
16252
+dist-check-gtkdoc:
16254
+dist-check-gtkdoc:
16255
+ @echo "*** gtk-doc must be installed and enabled in order to make dist"
16259
+dist-hook: dist-check-gtkdoc dist-hook-local
16260
+ mkdir $(distdir)/tmpl
16261
+ mkdir $(distdir)/xml
16262
+ mkdir $(distdir)/html
16263
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
16264
+ -cp $(srcdir)/xml/*.xml $(distdir)/xml
16265
+ cp $(srcdir)/html/* $(distdir)/html
16266
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
16267
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
16268
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
16269
+ ! which gtkdoc-rebase >/dev/null 2>&1 || \
16270
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
16272
+.PHONY : dist-hook-local docs
16273
Index: epiphany-browser-2.29.1/help/Makefile.in
16274
===================================================================
16275
--- epiphany-browser-2.29.1.orig/help/Makefile.in 2009-10-26 17:15:30.000000000 -0200
16276
+++ epiphany-browser-2.29.1/help/Makefile.in 2009-10-30 10:55:32.184299483 -0200
16277
@@ -143,8 +143,6 @@
16278
GMSGFMT = @GMSGFMT@
16280
GTKDOC_CHECK = @GTKDOC_CHECK@
16281
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
16282
-GTKDOC_REBASE = @GTKDOC_REBASE@
16283
G_IR_COMPILER = @G_IR_COMPILER@
16284
G_IR_GENERATE = @G_IR_GENERATE@
16285
G_IR_SCANNER = @G_IR_SCANNER@
16286
@@ -157,29 +155,10 @@
16287
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
16288
INSTOBJEXT = @INSTOBJEXT@
16289
INTLLIBS = @INTLLIBS@
16290
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
16291
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
16292
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
16293
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
16294
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
16295
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
16296
INTLTOOL_MERGE = @INTLTOOL_MERGE@
16297
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
16298
INTLTOOL_PERL = @INTLTOOL_PERL@
16299
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
16300
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
16301
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
16302
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
16303
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
16304
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
16305
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
16306
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
16307
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
16308
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
16309
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
16310
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
16311
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
16312
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
16313
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
16314
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
16316
@@ -214,6 +193,7 @@
16317
PACKAGE_NAME = @PACKAGE_NAME@
16318
PACKAGE_STRING = @PACKAGE_STRING@
16319
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16320
+PACKAGE_URL = @PACKAGE_URL@
16321
PACKAGE_VERSION = @PACKAGE_VERSION@
16322
PATH_SEPARATOR = @PATH_SEPARATOR@
16323
PKG_CONFIG = @PKG_CONFIG@
16324
@@ -295,6 +275,7 @@
16327
_DOC_ABS_SRCDIR = @abs_srcdir@
16328
+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
16329
@ENABLE_SK_TRUE@_ENABLE_SK = true
16331
################################################################################
16332
@@ -328,14 +309,16 @@
16334
################################################################################
16335
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
16336
+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
16337
_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
16338
_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
16340
$(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
16342
+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
16344
_DOC_C_DOCS_NOENT = \
16345
- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
16346
+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
16349
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
16350
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
16351
@@ -351,12 +334,16 @@
16354
###############################################################################
16355
-_DOC_POFILES = $(if $(DOC_MODULE), \
16356
+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
16357
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
16359
_DOC_LC_MODULES = $(if $(DOC_MODULE), \
16360
$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
16363
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
16364
+ $(lc)/$(notdir $(page)) ))
16366
_DOC_LC_INCLUDES = \
16367
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
16368
$(lc)/$(notdir $(inc)) ))
16369
@@ -368,7 +355,7 @@
16370
$(lc)/$(notdir $(doc)) ))
16373
- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
16374
+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
16375
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
16377
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
16378
@@ -388,7 +375,8 @@
16379
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
16380
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
16381
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
16382
-_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
16383
+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
16384
+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
16385
DOC_MODULE = epiphany
16386
DOC_ENTITIES = legal.xml
16387
DOC_LINGUAS = ca cs bg de el en_GB es eu fi fr it ja oc nl ru sv uk
16388
@@ -648,6 +636,10 @@
16399
@@ -664,6 +656,7 @@
16401
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
16402
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
16403
+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
16404
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
16405
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
16406
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
16407
@@ -708,16 +701,16 @@
16409
if ! test -f $@; then \
16410
echo "(cd $(dir $@) && \
16411
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
16412
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
16413
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
16415
- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
16416
+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
16417
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
16419
echo "(cd $(dir $@) && \
16420
- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
16421
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
16423
- $(_xml2po) -e -u $(notdir $@) $$docs); \
16424
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
16427
# FIXME: fix the dependancy
16428
@@ -726,15 +719,16 @@
16429
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
16430
if ! test -d $(dir $@); then mkdir $(dir $@); fi
16431
if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
16432
+ po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
16433
+ if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
16435
- $(_xml2po) -e -p \
16436
- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
16437
+ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
16438
"$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
16439
cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
16442
$(_DOC_POT): $(_DOC_C_DOCS_NOENT)
16443
- $(_xml2po) -e -o $@ $^
16444
+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
16446
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
16447
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
16448
@@ -746,6 +740,8 @@
16449
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
16450
$(_DOC_HTML_ALL) $(_DOC_POFILES)
16452
+################################################################################
16454
.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
16456
clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
16457
@@ -764,7 +760,7 @@
16458
rm -f "$$lc/.xml2po.mo"; \
16462
+clean-doc-dir: clean-doc-lc
16463
@for lc in C $(_DOC_REAL_LINGUAS); do \
16464
for dir in `find $$lc -depth -type d`; do \
16465
if ! test $$dir -ef $(srcdir)/$$dir; then \
16466
@@ -787,10 +783,12 @@
16467
$(_clean_omf) $(_clean_dsk) \
16468
$(_clean_lc) $(_clean_dir)
16470
-.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
16472
- $(if $(DOC_MODULE),dist-doc-docs) \
16473
- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
16474
+################################################################################
16476
+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
16478
+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
16479
+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
16480
$(if $(_DOC_OMF_IN),dist-doc-omf)
16481
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
16483
@@ -836,9 +834,12 @@
16484
echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
16485
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
16487
+################################################################################
16489
.PHONY: check-doc-docs check-doc-omf
16491
$(if $(DOC_MODULE),check-doc-docs) \
16492
+ $(if $(DOC_ID),check-doc-pages) \
16493
$(if $(_DOC_OMF_IN),check-doc-omf)
16495
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
16496
@@ -854,15 +855,33 @@
16497
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
16500
+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
16501
+ for lc in C $(_DOC_REAL_LINGUAS); do \
16502
+ if test -f "$$lc"; \
16504
+ xmlpath="$$lc"; \
16506
+ d="$(srcdir)/"; \
16507
+ xmlpath="$$lc:$(srcdir)/$$lc"; \
16509
+ for page in $(DOC_PAGES); do \
16510
+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
16511
+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
16515
check-doc-omf: $(_DOC_OMF_ALL)
16516
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
16517
echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
16518
xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
16521
+################################################################################
16523
.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
16525
install-data-local: \
16526
- $(if $(DOC_MODULE),install-doc-docs) \
16527
+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
16528
$(if $(_DOC_HTML_ALL),install-doc-html) \
16529
$(if $(_DOC_C_FIGURES),install-doc-figs) \
16530
$(if $(_DOC_OMF_IN),install-doc-omf)
16531
@@ -870,42 +889,46 @@
16534
@for lc in C $(_DOC_REAL_LINGUAS); do \
16535
- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
16536
- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
16537
+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
16538
+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
16540
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
16541
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
16542
docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
16543
- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
16544
+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
16545
if ! test -d "$$docdir"; then \
16546
echo "$(mkinstalldirs) $$docdir"; \
16547
$(mkinstalldirs) "$$docdir"; \
16549
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
16550
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
16551
+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
16552
+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
16556
@list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \
16557
for lc in C $(_DOC_REAL_LINGUAS); do \
16558
+ figsymlink=false; \
16559
if test -f "$$lc/$$fig"; then \
16560
figfile="$$lc/$$fig"; \
16561
elif test -f "$(srcdir)/$$lc/$$fig"; then \
16562
figfile="$(srcdir)/$$lc/$$fig"; \
16563
- elif test -f "C/$$fig"; then \
16564
- figfile="C/$$fig"; \
16566
- figfile="$(srcdir)/C/$$fig"; \
16567
+ figsymlink=true; \
16569
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
16570
- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
16571
+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
16572
if ! test -d "$$figdir"; then \
16573
echo "$(mkinstalldirs) $$figdir"; \
16574
$(mkinstalldirs) "$$figdir"; \
16576
figbase=`echo $$fig | sed -e 's/^.*\///'`; \
16577
- echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
16578
- $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
16579
+ if $$figsymlink; then \
16580
+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
16581
+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
16583
+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
16584
+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
16589
@@ -913,22 +936,24 @@
16593
- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
16594
+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
16595
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
16596
- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16597
- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
16598
+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16599
+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
16601
@if test "x$(_ENABLE_SK)" = "xtrue"; then \
16602
- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
16603
- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
16604
+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
16605
+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
16611
+################################################################################
16613
.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
16615
- $(if $(DOC_MODULE),uninstall-doc-docs) \
16616
+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
16617
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
16618
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
16619
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
16620
@@ -936,24 +961,24 @@
16622
uninstall-doc-docs:
16623
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
16624
- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
16625
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
16626
+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
16627
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
16630
uninstall-doc-figs:
16631
@list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
16632
- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
16633
- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
16634
+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
16635
+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
16639
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
16640
if test "x$(_ENABLE_SK)" = "xtrue"; then \
16641
- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16642
- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16643
+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16644
+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16646
- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16647
- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
16648
+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16649
+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
16652
dist-hook: doc-dist-hook
16653
Index: epiphany-browser-2.29.1/lib/egg/Makefile.in
16654
===================================================================
16655
--- epiphany-browser-2.29.1.orig/lib/egg/Makefile.in 2009-10-26 17:15:30.000000000 -0200
16656
+++ epiphany-browser-2.29.1/lib/egg/Makefile.in 2009-10-30 10:55:32.596798983 -0200
16657
@@ -166,8 +166,6 @@
16658
GMSGFMT = @GMSGFMT@
16660
GTKDOC_CHECK = @GTKDOC_CHECK@
16661
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
16662
-GTKDOC_REBASE = @GTKDOC_REBASE@
16663
G_IR_COMPILER = @G_IR_COMPILER@
16664
G_IR_GENERATE = @G_IR_GENERATE@
16665
G_IR_SCANNER = @G_IR_SCANNER@
16666
@@ -180,29 +178,10 @@
16667
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
16668
INSTOBJEXT = @INSTOBJEXT@
16669
INTLLIBS = @INTLLIBS@
16670
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
16671
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
16672
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
16673
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
16674
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
16675
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
16676
INTLTOOL_MERGE = @INTLTOOL_MERGE@
16677
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
16678
INTLTOOL_PERL = @INTLTOOL_PERL@
16679
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
16680
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
16681
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
16682
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
16683
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
16684
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
16685
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
16686
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
16687
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
16688
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
16689
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
16690
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
16691
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
16692
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
16693
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
16694
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
16696
@@ -237,6 +216,7 @@
16697
PACKAGE_NAME = @PACKAGE_NAME@
16698
PACKAGE_STRING = @PACKAGE_STRING@
16699
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16700
+PACKAGE_URL = @PACKAGE_URL@
16701
PACKAGE_VERSION = @PACKAGE_VERSION@
16702
PATH_SEPARATOR = @PATH_SEPARATOR@
16703
PKG_CONFIG = @PKG_CONFIG@
16704
Index: epiphany-browser-2.29.1/lib/Makefile.in
16705
===================================================================
16706
--- epiphany-browser-2.29.1.orig/lib/Makefile.in 2009-10-26 17:15:30.000000000 -0200
16707
+++ epiphany-browser-2.29.1/lib/Makefile.in 2009-10-30 10:55:32.408300471 -0200
16708
@@ -264,8 +264,6 @@
16709
GMSGFMT = @GMSGFMT@
16711
GTKDOC_CHECK = @GTKDOC_CHECK@
16712
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
16713
-GTKDOC_REBASE = @GTKDOC_REBASE@
16714
G_IR_COMPILER = @G_IR_COMPILER@
16715
G_IR_GENERATE = @G_IR_GENERATE@
16716
G_IR_SCANNER = @G_IR_SCANNER@
16717
@@ -278,29 +276,10 @@
16718
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
16719
INSTOBJEXT = @INSTOBJEXT@
16720
INTLLIBS = @INTLLIBS@
16721
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
16722
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
16723
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
16724
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
16725
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
16726
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
16727
INTLTOOL_MERGE = @INTLTOOL_MERGE@
16728
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
16729
INTLTOOL_PERL = @INTLTOOL_PERL@
16730
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
16731
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
16732
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
16733
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
16734
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
16735
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
16736
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
16737
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
16738
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
16739
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
16740
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
16741
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
16742
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
16743
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
16744
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
16745
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
16747
@@ -335,6 +314,7 @@
16748
PACKAGE_NAME = @PACKAGE_NAME@
16749
PACKAGE_STRING = @PACKAGE_STRING@
16750
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16751
+PACKAGE_URL = @PACKAGE_URL@
16752
PACKAGE_VERSION = @PACKAGE_VERSION@
16753
PATH_SEPARATOR = @PATH_SEPARATOR@
16754
PKG_CONFIG = @PKG_CONFIG@
16755
@@ -466,7 +446,7 @@
15019
16756
-I$(top_srcdir)/lib/egg \
15020
16757
-DDATADIR="\"$(datadir)\"" \
15021
16758
-DSHARE_DIR=\"$(pkgdatadir)\" \
15024
16761
$(AM_CPPFLAGS)
15026
16763
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
15027
Index: epiphany-browser-2.28.0/ltmain.sh
15028
===================================================================
15029
--- epiphany-browser-2.28.0.orig/ltmain.sh 2009-09-24 18:15:07.332439994 -0300
15030
+++ epiphany-browser-2.28.0/ltmain.sh 2009-09-24 18:19:47.344440568 -0300
15031
@@ -4202,6 +4202,11 @@
16764
Index: epiphany-browser-2.29.1/lib/widgets/Makefile.in
16765
===================================================================
16766
--- epiphany-browser-2.29.1.orig/lib/widgets/Makefile.in 2009-10-26 17:15:31.000000000 -0200
16767
+++ epiphany-browser-2.29.1/lib/widgets/Makefile.in 2009-10-30 10:55:32.740328202 -0200
16768
@@ -161,8 +161,6 @@
16769
GMSGFMT = @GMSGFMT@
16771
GTKDOC_CHECK = @GTKDOC_CHECK@
16772
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
16773
-GTKDOC_REBASE = @GTKDOC_REBASE@
16774
G_IR_COMPILER = @G_IR_COMPILER@
16775
G_IR_GENERATE = @G_IR_GENERATE@
16776
G_IR_SCANNER = @G_IR_SCANNER@
16777
@@ -175,29 +173,10 @@
16778
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
16779
INSTOBJEXT = @INSTOBJEXT@
16780
INTLLIBS = @INTLLIBS@
16781
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
16782
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
16783
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
16784
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
16785
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
16786
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
16787
INTLTOOL_MERGE = @INTLTOOL_MERGE@
16788
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
16789
INTLTOOL_PERL = @INTLTOOL_PERL@
16790
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
16791
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
16792
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
16793
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
16794
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
16795
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
16796
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
16797
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
16798
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
16799
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
16800
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
16801
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
16802
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
16803
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
16804
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
16805
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
16807
@@ -232,6 +211,7 @@
16808
PACKAGE_NAME = @PACKAGE_NAME@
16809
PACKAGE_STRING = @PACKAGE_STRING@
16810
PACKAGE_TARNAME = @PACKAGE_TARNAME@
16811
+PACKAGE_URL = @PACKAGE_URL@
16812
PACKAGE_VERSION = @PACKAGE_VERSION@
16813
PATH_SEPARATOR = @PATH_SEPARATOR@
16814
PKG_CONFIG = @PKG_CONFIG@
16815
Index: epiphany-browser-2.29.1/ltmain.sh
16816
===================================================================
16817
--- epiphany-browser-2.29.1.orig/ltmain.sh 2009-10-22 13:24:09.000000000 -0200
16818
+++ epiphany-browser-2.29.1/ltmain.sh 2009-10-30 10:55:17.344299129 -0200
16821
# compiler flags: $LTCFLAGS
16822
# linker: $LD (gnu? $with_gnu_ld)
16823
-# $progname: (GNU libtool) 2.2.6
16824
+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
16825
# automake: $automake_version
16826
# autoconf: $autoconf_version
16833
+VERSION="2.2.6 Debian-2.2.6a-4"
16835
package_revision=1.3012
16837
@@ -5033,7 +5033,10 @@
16839
dlopen) libs="$dlfiles" ;;
16840
dlpreopen) libs="$dlprefiles" ;;
16841
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
16843
+ libs="$deplibs %DEPLIBS%"
16844
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
16848
if test "$linkmode,$pass" = "lib,dlpreopen"; then
16849
@@ -5344,19 +5347,19 @@
16850
# It is a libtool convenience library, so add in its objects.
16851
convenience="$convenience $ladir/$objdir/$old_library"
16852
old_convenience="$old_convenience $ladir/$objdir/$old_library"
16854
+ for deplib in $dependency_libs; do
16855
+ deplibs="$deplib $deplibs"
16856
+ if $opt_duplicate_deps ; then
16857
+ case "$tmp_libs " in
16858
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
16861
+ tmp_libs="$tmp_libs $deplib"
16863
elif test "$linkmode" != prog && test "$linkmode" != lib; then
16864
func_fatal_error "\`$lib' is not a convenience library"
16867
- for deplib in $dependency_libs; do
16868
- deplibs="$deplib $deplibs"
16869
- if $opt_duplicate_deps ; then
16870
- case "$tmp_libs " in
16871
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
16874
- tmp_libs="$tmp_libs $deplib"
16879
@@ -5893,6 +5896,7 @@
16880
if test "$link_all_deplibs" != no; then
16881
# Add the search paths of all dependency libraries
16882
for deplib in $dependency_libs; do
16885
-L*) path="$deplib" ;;
16887
@@ -6206,6 +6210,9 @@
16888
revision="$number_minor"
16889
lt_irix_increment=no
15036
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
15037
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
15038
+ exit $EXIT_FAILURE
16892
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
15043
Index: epiphany-browser-2.28.0/src/Makefile.in
15044
===================================================================
15045
--- epiphany-browser-2.28.0.orig/src/Makefile.in 2009-09-24 18:15:07.368448392 -0300
15046
+++ epiphany-browser-2.28.0/src/Makefile.in 2009-09-24 18:20:09.744940497 -0300
15047
@@ -418,6 +418,7 @@
15048
PACKAGE_NAME = @PACKAGE_NAME@
15049
PACKAGE_STRING = @PACKAGE_STRING@
15050
PACKAGE_TARNAME = @PACKAGE_TARNAME@
15051
+PACKAGE_URL = @PACKAGE_URL@
15052
PACKAGE_VERSION = @PACKAGE_VERSION@
15053
PATH_SEPARATOR = @PATH_SEPARATOR@
15054
PKG_CONFIG = @PKG_CONFIG@
15055
@@ -551,8 +552,8 @@
16897
Index: epiphany-browser-2.29.1/m4/gnome-doc-utils.m4
16898
===================================================================
16899
--- epiphany-browser-2.29.1.orig/m4/gnome-doc-utils.m4 2009-10-22 13:24:10.000000000 -0200
16900
+++ epiphany-browser-2.29.1/m4/gnome-doc-utils.m4 2009-10-30 10:55:17.344299129 -0200
16901
@@ -36,15 +36,19 @@
16902
# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
16904
AC_DEFUN([GNOME_DOC_INIT],
16906
+[AC_REQUIRE([AC_PROG_LN_S])dnl
16908
ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
16910
+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
16911
PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
16912
[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
16914
if test "$gdu_cv_have_gdu" = "yes"; then
16915
+ AC_MSG_RESULT([yes])
16916
ifelse([$2],,[:],[$2])
16918
+ AC_MSG_RESULT([no])
16919
ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
16922
Index: epiphany-browser-2.29.1/m4/gtk-doc.m4
16923
===================================================================
16924
--- epiphany-browser-2.29.1.orig/m4/gtk-doc.m4 2009-10-22 13:24:10.000000000 -0200
16925
+++ epiphany-browser-2.29.1/m4/gtk-doc.m4 2009-10-30 10:55:17.344299129 -0200
16928
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
16929
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
16931
- dnl check for tools we added during development
16932
- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
16933
- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
16934
- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
16936
dnl for overriding the documentation installation directory
16937
AC_ARG_WITH([html-dir],
16938
AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
16939
@@ -32,30 +26,14 @@
16940
[PKG_CHECK_EXISTS([gtk-doc],,
16941
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
16942
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
16943
- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
16944
+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
16947
AC_MSG_CHECKING([whether to build gtk-doc documentation])
16948
AC_MSG_RESULT($enable_gtk_doc)
16950
- dnl enable/disable output formats
16951
- AC_ARG_ENABLE([gtk-doc-html],
16952
- AS_HELP_STRING([--enable-gtk-doc-html],
16953
- [build documentation in html format [[default=yes]]]),,
16954
- [enable_gtk_doc_html=yes])
16955
- AC_ARG_ENABLE([gtk-doc-pdf],
16956
- AS_HELP_STRING([--enable-gtk-doc-pdf],
16957
- [build documentation in pdf format [[default=no]]]),,
16958
- [enable_gtk_doc_pdf=no])
16960
- if test -n "$GTKDOC_MKPDF"; then
16961
- enable_gtk_doc_pdf=no
16964
+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
16966
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
16967
- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
16968
- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
16969
AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
16970
- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
16972
Index: epiphany-browser-2.29.1/m4/intltool.m4
16973
===================================================================
16974
--- epiphany-browser-2.29.1.orig/m4/intltool.m4 2009-10-22 13:24:10.000000000 -0200
16975
+++ epiphany-browser-2.29.1/m4/intltool.m4 2009-10-30 10:55:17.344299129 -0200
16976
@@ -75,25 +75,25 @@
16977
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
16978
INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
16980
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
16981
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
16982
-AC_SUBST(INTLTOOL_KEYS_RULE)
16983
-AC_SUBST(INTLTOOL_PROP_RULE)
16984
-AC_SUBST(INTLTOOL_OAF_RULE)
16985
-AC_SUBST(INTLTOOL_PONG_RULE)
16986
-AC_SUBST(INTLTOOL_SERVER_RULE)
16987
-AC_SUBST(INTLTOOL_SHEET_RULE)
16988
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
16989
-AC_SUBST(INTLTOOL_UI_RULE)
16990
-AC_SUBST(INTLTOOL_XAM_RULE)
16991
-AC_SUBST(INTLTOOL_KBD_RULE)
16992
-AC_SUBST(INTLTOOL_XML_RULE)
16993
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
16994
-AC_SUBST(INTLTOOL_CAVES_RULE)
16995
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
16996
-AC_SUBST(INTLTOOL_THEME_RULE)
16997
-AC_SUBST(INTLTOOL_SERVICE_RULE)
16998
-AC_SUBST(INTLTOOL_POLICY_RULE)
16999
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
17000
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
17001
+_IT_SUBST(INTLTOOL_KEYS_RULE)
17002
+_IT_SUBST(INTLTOOL_PROP_RULE)
17003
+_IT_SUBST(INTLTOOL_OAF_RULE)
17004
+_IT_SUBST(INTLTOOL_PONG_RULE)
17005
+_IT_SUBST(INTLTOOL_SERVER_RULE)
17006
+_IT_SUBST(INTLTOOL_SHEET_RULE)
17007
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
17008
+_IT_SUBST(INTLTOOL_UI_RULE)
17009
+_IT_SUBST(INTLTOOL_XAM_RULE)
17010
+_IT_SUBST(INTLTOOL_KBD_RULE)
17011
+_IT_SUBST(INTLTOOL_XML_RULE)
17012
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
17013
+_IT_SUBST(INTLTOOL_CAVES_RULE)
17014
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
17015
+_IT_SUBST(INTLTOOL_THEME_RULE)
17016
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
17017
+_IT_SUBST(INTLTOOL_POLICY_RULE)
17019
# Check the gettext tools to make sure they are GNU
17020
AC_PATH_PROG(XGETTEXT, xgettext)
17021
@@ -110,12 +110,17 @@
17022
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
17025
-AC_PATH_PROG(INTLTOOL_PERL, [perl])
17026
+AC_PATH_PROG(INTLTOOL_PERL, perl)
17027
if test -z "$INTLTOOL_PERL"; then
17028
- AC_MSG_ERROR([perl not found; required for intltool])
17029
+ AC_MSG_ERROR([perl not found])
17031
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
17032
- AC_MSG_ERROR([perl 5.x required for intltool])
17033
+AC_MSG_CHECKING([for perl >= 5.8.1])
17034
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
17035
+if test $? -ne 0; then
17036
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
17038
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
17039
+ AC_MSG_RESULT([$IT_PERL_VERSION])
17041
if test "x$2" != "xno-xml"; then
17042
AC_MSG_CHECKING([for XML::Parser])
17043
@@ -171,7 +176,7 @@
17044
dnl of config.status.
17045
AC_CONFIG_COMMANDS_PRE([
17046
AC_CONFIG_COMMANDS([$1/stamp-it], [
17047
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
17048
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
17049
AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
17051
rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
17052
@@ -193,6 +198,17 @@
17056
+# _IT_SUBST(VARIABLE)
17057
+# -------------------
17058
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
17060
+AC_DEFUN([_IT_SUBST],
17063
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
17067
# deprecated macros
17068
AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
17069
# A hint is needed for aclocal from Automake <= 1.9.4:
17070
Index: epiphany-browser-2.29.1/m4/libtool.m4
17071
===================================================================
17072
--- epiphany-browser-2.29.1.orig/m4/libtool.m4 2009-10-22 13:24:09.000000000 -0200
17073
+++ epiphany-browser-2.29.1/m4/libtool.m4 2009-10-30 10:55:17.348298964 -0200
17074
@@ -2470,13 +2470,10 @@
17075
# before this can be enabled.
17076
hardcode_into_libs=yes
17078
- # Add ABI-specific directories to the system library path.
17079
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
17081
# Append ld.so.conf contents to the search path
17082
if test -f /etc/ld.so.conf; then
17083
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
17084
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
17085
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
17088
# We used to test for /lib/ld.so.1 and disable shared libraries on
17089
@@ -2488,6 +2485,18 @@
17090
dynamic_linker='GNU/Linux ld.so'
17094
+ version_type=linux
17095
+ need_lib_prefix=no
17097
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
17098
+ soname_spec='${libname}${release}${shared_ext}$major'
17099
+ shlibpath_var=LD_LIBRARY_PATH
17100
+ shlibpath_overrides_runpath=no
17101
+ hardcode_into_libs=yes
17102
+ dynamic_linker='NetBSD ld.elf_so'
17108
@@ -3079,7 +3088,7 @@
17109
lt_cv_deplibs_check_method=pass_all
17113
+netbsd* | netbsdelf*-gnu)
17114
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
17115
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
17117
@@ -3760,7 +3769,7 @@
17122
+ netbsd* | netbsdelf*-gnu)
17125
# QNX uses GNU C++, but need to define -shared option too, otherwise
17126
@@ -4185,6 +4194,9 @@
17127
cygwin* | mingw* | cegcc*)
17128
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
17130
+ linux* | k*bsd*-gnu)
17131
+ _LT_TAGVAR(link_all_deplibs, $1)=no
17134
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
17136
@@ -4249,6 +4261,9 @@
17140
+ linux* | k*bsd*-gnu)
17141
+ _LT_TAGVAR(link_all_deplibs, $1)=no
17145
_LT_TAGVAR(ld_shlibs, $1)=yes
17146
@@ -4431,7 +4446,7 @@
17151
+ netbsd* | netbsdelf*-gnu)
17152
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
17153
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17155
@@ -4606,6 +4621,7 @@
17156
if test "$aix_use_runtimelinking" = yes; then
17157
shared_flag="$shared_flag "'${wl}-G'
17159
+ _LT_TAGVAR(link_all_deplibs, $1)=no
17162
if test "$host_cpu" = ia64; then
17163
@@ -4844,7 +4860,7 @@
17164
_LT_TAGVAR(link_all_deplibs, $1)=yes
17168
+ netbsd* | netbsdelf*-gnu)
17169
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
17170
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
17172
Index: epiphany-browser-2.29.1/Makefile.in
17173
===================================================================
17174
--- epiphany-browser-2.29.1.orig/Makefile.in 2009-10-26 17:15:32.000000000 -0200
17175
+++ epiphany-browser-2.29.1/Makefile.in 2009-10-30 10:55:33.652298047 -0200
17176
@@ -179,8 +179,6 @@
17177
GMSGFMT = @GMSGFMT@
17179
GTKDOC_CHECK = @GTKDOC_CHECK@
17180
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
17181
-GTKDOC_REBASE = @GTKDOC_REBASE@
17182
G_IR_COMPILER = @G_IR_COMPILER@
17183
G_IR_GENERATE = @G_IR_GENERATE@
17184
G_IR_SCANNER = @G_IR_SCANNER@
17185
@@ -193,29 +191,10 @@
17186
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
17187
INSTOBJEXT = @INSTOBJEXT@
17188
INTLLIBS = @INTLLIBS@
17189
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
17190
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
17191
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
17192
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
17193
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
17194
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
17195
INTLTOOL_MERGE = @INTLTOOL_MERGE@
17196
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
17197
INTLTOOL_PERL = @INTLTOOL_PERL@
17198
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
17199
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
17200
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
17201
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
17202
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
17203
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
17204
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
17205
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
17206
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
17207
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
17208
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
17209
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
17210
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
17211
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
17212
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
17213
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
17215
@@ -250,6 +229,7 @@
17216
PACKAGE_NAME = @PACKAGE_NAME@
17217
PACKAGE_STRING = @PACKAGE_STRING@
17218
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17219
+PACKAGE_URL = @PACKAGE_URL@
17220
PACKAGE_VERSION = @PACKAGE_VERSION@
17221
PATH_SEPARATOR = @PATH_SEPARATOR@
17222
PKG_CONFIG = @PKG_CONFIG@
17223
Index: epiphany-browser-2.29.1/po/Makefile.in.in
17224
===================================================================
17225
--- epiphany-browser-2.29.1.orig/po/Makefile.in.in 2009-10-22 13:24:10.000000000 -0200
17226
+++ epiphany-browser-2.29.1/po/Makefile.in.in 2009-10-30 10:55:17.348298964 -0200
17228
PACKAGE = @PACKAGE@
17229
VERSION = @VERSION@
17235
top_srcdir = @top_srcdir@
17238
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
17240
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
17241
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
17243
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
17245
Index: epiphany-browser-2.29.1/src/bookmarks/Makefile.in
17246
===================================================================
17247
--- epiphany-browser-2.29.1.orig/src/bookmarks/Makefile.in 2009-10-26 17:15:31.000000000 -0200
17248
+++ epiphany-browser-2.29.1/src/bookmarks/Makefile.in 2009-10-30 10:55:33.420798927 -0200
17249
@@ -209,8 +209,6 @@
17250
GMSGFMT = @GMSGFMT@
17252
GTKDOC_CHECK = @GTKDOC_CHECK@
17253
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
17254
-GTKDOC_REBASE = @GTKDOC_REBASE@
17255
G_IR_COMPILER = @G_IR_COMPILER@
17256
G_IR_GENERATE = @G_IR_GENERATE@
17257
G_IR_SCANNER = @G_IR_SCANNER@
17258
@@ -223,29 +221,10 @@
17259
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
17260
INSTOBJEXT = @INSTOBJEXT@
17261
INTLLIBS = @INTLLIBS@
17262
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
17263
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
17264
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
17265
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
17266
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
17267
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
17268
INTLTOOL_MERGE = @INTLTOOL_MERGE@
17269
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
17270
INTLTOOL_PERL = @INTLTOOL_PERL@
17271
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
17272
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
17273
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
17274
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
17275
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
17276
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
17277
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
17278
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
17279
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
17280
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
17281
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
17282
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
17283
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
17284
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
17285
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
17286
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
17288
@@ -280,6 +259,7 @@
17289
PACKAGE_NAME = @PACKAGE_NAME@
17290
PACKAGE_STRING = @PACKAGE_STRING@
17291
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17292
+PACKAGE_URL = @PACKAGE_URL@
17293
PACKAGE_VERSION = @PACKAGE_VERSION@
17294
PATH_SEPARATOR = @PATH_SEPARATOR@
17295
PKG_CONFIG = @PKG_CONFIG@
17296
Index: epiphany-browser-2.29.1/src/Makefile.in
17297
===================================================================
17298
--- epiphany-browser-2.29.1.orig/src/Makefile.in 2009-10-26 17:15:31.000000000 -0200
17299
+++ epiphany-browser-2.29.1/src/Makefile.in 2009-10-30 10:55:33.204799352 -0200
17300
@@ -346,8 +346,6 @@
17301
GMSGFMT = @GMSGFMT@
17303
GTKDOC_CHECK = @GTKDOC_CHECK@
17304
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
17305
-GTKDOC_REBASE = @GTKDOC_REBASE@
17306
G_IR_COMPILER = @G_IR_COMPILER@
17307
G_IR_GENERATE = @G_IR_GENERATE@
17308
G_IR_SCANNER = @G_IR_SCANNER@
17309
@@ -360,29 +358,10 @@
17310
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
17311
INSTOBJEXT = @INSTOBJEXT@
17312
INTLLIBS = @INTLLIBS@
17313
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
17314
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
17315
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
17316
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
17317
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
17318
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
17319
INTLTOOL_MERGE = @INTLTOOL_MERGE@
17320
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
17321
INTLTOOL_PERL = @INTLTOOL_PERL@
17322
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
17323
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
17324
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
17325
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
17326
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
17327
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
17328
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
17329
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
17330
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
17331
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
17332
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
17333
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
17334
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
17335
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
17336
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
17337
INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
17339
@@ -417,6 +396,7 @@
17340
PACKAGE_NAME = @PACKAGE_NAME@
17341
PACKAGE_STRING = @PACKAGE_STRING@
17342
PACKAGE_TARNAME = @PACKAGE_TARNAME@
17343
+PACKAGE_URL = @PACKAGE_URL@
17344
PACKAGE_VERSION = @PACKAGE_VERSION@
17345
PATH_SEPARATOR = @PATH_SEPARATOR@
17346
PKG_CONFIG = @PKG_CONFIG@
17347
@@ -550,8 +530,8 @@
15056
17348
-I$(top_srcdir)/lib/egg \
15057
17349
-I$(top_srcdir)/lib/widgets \
15058
17350
-I$(top_srcdir)/src/bookmarks \