|
Line 0
Link Here
|
|
|
1 |
|
| 2 |
$FreeBSD$ |
| 3 |
|
| 4 |
--- configure.orig |
| 5 |
+++ configure |
| 6 |
@@ -6432,218 +6432,10 @@ |
| 7 |
fi |
| 8 |
|
| 9 |
|
| 10 |
- |
| 11 |
- ALSA_REQUIRED=1.0.0 |
| 12 |
- ALSA_MODULES="alsa >= $ALSA_REQUIRED" |
| 13 |
- |
| 14 |
- succeeded=no |
| 15 |
- |
| 16 |
- # Extract the first word of "pkg-config", so it can be a program name with args. |
| 17 |
-set dummy pkg-config; ac_word=$2 |
| 18 |
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 19 |
-$as_echo_n "checking for $ac_word... " >&6; } |
| 20 |
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then |
| 21 |
- $as_echo_n "(cached) " >&6 |
| 22 |
-else |
| 23 |
- case $PKG_CONFIG in |
| 24 |
- [\\/]* | ?:[\\/]*) |
| 25 |
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
| 26 |
- ;; |
| 27 |
- *) |
| 28 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 29 |
-for as_dir in $PATH |
| 30 |
-do |
| 31 |
- IFS=$as_save_IFS |
| 32 |
- test -z "$as_dir" && as_dir=. |
| 33 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
| 34 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 35 |
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
| 36 |
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 37 |
- break 2 |
| 38 |
- fi |
| 39 |
-done |
| 40 |
-done |
| 41 |
-IFS=$as_save_IFS |
| 42 |
- |
| 43 |
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" |
| 44 |
- ;; |
| 45 |
-esac |
| 46 |
-fi |
| 47 |
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
| 48 |
-if test -n "$PKG_CONFIG"; then |
| 49 |
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 |
| 50 |
-$as_echo "$PKG_CONFIG" >&6; } |
| 51 |
-else |
| 52 |
- { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 53 |
-$as_echo "no" >&6; } |
| 54 |
fi |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
- if test "$PKG_CONFIG" = "no" ; then |
| 59 |
- HAVE_ALSA=no |
| 60 |
- else |
| 61 |
- PKG_CONFIG_MIN_VERSION=0.9.0 |
| 62 |
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then |
| 63 |
- { $as_echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5 |
| 64 |
-$as_echo_n "checking for $ALSA_MODULES... " >&6; } |
| 65 |
- |
| 66 |
- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then |
| 67 |
- { $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 68 |
-$as_echo "yes" >&6; } |
| 69 |
- succeeded=yes |
| 70 |
- |
| 71 |
- { $as_echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 |
| 72 |
-$as_echo_n "checking ALSA_CFLAGS... " >&6; } |
| 73 |
- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'` |
| 74 |
- { $as_echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 |
| 75 |
-$as_echo "$ALSA_CFLAGS" >&6; } |
| 76 |
- |
| 77 |
- { $as_echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 |
| 78 |
-$as_echo_n "checking ALSA_LIBS... " >&6; } |
| 79 |
- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'` |
| 80 |
- { $as_echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 |
| 81 |
-$as_echo "$ALSA_LIBS" >&6; } |
| 82 |
- else |
| 83 |
- { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 84 |
-$as_echo "no" >&6; } |
| 85 |
- ALSA_CFLAGS="" |
| 86 |
- ALSA_LIBS="" |
| 87 |
- ## If we have a custom action on failure, don't print errors, but |
| 88 |
- ## do set a variable so people can do so. |
| 89 |
- ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"` |
| 90 |
- |
| 91 |
- fi |
| 92 |
- |
| 93 |
- |
| 94 |
- |
| 95 |
- else |
| 96 |
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." |
| 97 |
- echo "*** See http://www.freedesktop.org/software/pkgconfig" |
| 98 |
- fi |
| 99 |
- fi |
| 100 |
- |
| 101 |
- if test $succeeded = yes; then |
| 102 |
- HAVE_ALSA=yes |
| 103 |
- else |
| 104 |
- HAVE_ALSA=no |
| 105 |
- fi |
| 106 |
- |
| 107 |
- if test $HAVE_ALSA = yes; then |
| 108 |
- SAVE_CFLAGS="$CFLAGS" |
| 109 |
- SAVE_LDFLAGS="$LDFLAGS" |
| 110 |
- CFLAGS="$ALSA_CFLAGS $CFLAGS" |
| 111 |
- LDFLAGS="$ALSA_LIBS $LDFLAGS" |
| 112 |
- cat >conftest.$ac_ext <<_ACEOF |
| 113 |
-/* confdefs.h. */ |
| 114 |
-_ACEOF |
| 115 |
-cat confdefs.h >>conftest.$ac_ext |
| 116 |
-cat >>conftest.$ac_ext <<_ACEOF |
| 117 |
-/* end confdefs.h. */ |
| 118 |
-#include <asoundlib.h> |
| 119 |
-int |
| 120 |
-main () |
| 121 |
-{ |
| 122 |
-snd_lib_error_set_handler (0); |
| 123 |
- ; |
| 124 |
- return 0; |
| 125 |
-} |
| 126 |
-_ACEOF |
| 127 |
-rm -f conftest.$ac_objext |
| 128 |
-if { (ac_try="$ac_compile" |
| 129 |
-case "(($ac_try" in |
| 130 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 131 |
- *) ac_try_echo=$ac_try;; |
| 132 |
-esac |
| 133 |
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 134 |
-$as_echo "$ac_try_echo") >&5 |
| 135 |
- (eval "$ac_compile") 2>conftest.er1 |
| 136 |
- ac_status=$? |
| 137 |
- grep -v '^ *+' conftest.er1 >conftest.err |
| 138 |
- rm -f conftest.er1 |
| 139 |
- cat conftest.err >&5 |
| 140 |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 141 |
- (exit $ac_status); } && { |
| 142 |
- test -z "$ac_c_werror_flag" || |
| 143 |
- test ! -s conftest.err |
| 144 |
- } && test -s conftest.$ac_objext; then |
| 145 |
- emacs_alsa_normal=yes |
| 146 |
-else |
| 147 |
- $as_echo "$as_me: failed program was:" >&5 |
| 148 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
| 149 |
- |
| 150 |
- emacs_alsa_normal=no |
| 151 |
-fi |
| 152 |
- |
| 153 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 154 |
- if test "$emacs_alsa_normal" != yes; then |
| 155 |
- cat >conftest.$ac_ext <<_ACEOF |
| 156 |
-/* confdefs.h. */ |
| 157 |
-_ACEOF |
| 158 |
-cat confdefs.h >>conftest.$ac_ext |
| 159 |
-cat >>conftest.$ac_ext <<_ACEOF |
| 160 |
-/* end confdefs.h. */ |
| 161 |
-#include <alsa/asoundlib.h> |
| 162 |
-int |
| 163 |
-main () |
| 164 |
-{ |
| 165 |
-snd_lib_error_set_handler (0); |
| 166 |
- ; |
| 167 |
- return 0; |
| 168 |
-} |
| 169 |
-_ACEOF |
| 170 |
-rm -f conftest.$ac_objext |
| 171 |
-if { (ac_try="$ac_compile" |
| 172 |
-case "(($ac_try" in |
| 173 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 174 |
- *) ac_try_echo=$ac_try;; |
| 175 |
-esac |
| 176 |
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 177 |
-$as_echo "$ac_try_echo") >&5 |
| 178 |
- (eval "$ac_compile") 2>conftest.er1 |
| 179 |
- ac_status=$? |
| 180 |
- grep -v '^ *+' conftest.er1 >conftest.err |
| 181 |
- rm -f conftest.er1 |
| 182 |
- cat conftest.err >&5 |
| 183 |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 184 |
- (exit $ac_status); } && { |
| 185 |
- test -z "$ac_c_werror_flag" || |
| 186 |
- test ! -s conftest.err |
| 187 |
- } && test -s conftest.$ac_objext; then |
| 188 |
- emacs_alsa_subdir=yes |
| 189 |
-else |
| 190 |
- $as_echo "$as_me: failed program was:" >&5 |
| 191 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
| 192 |
- |
| 193 |
- emacs_alsa_subdir=no |
| 194 |
-fi |
| 195 |
- |
| 196 |
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 197 |
- if test "$emacs_alsa_subdir" != yes; then |
| 198 |
- { { $as_echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&5 |
| 199 |
-$as_echo "$as_me: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&2;} |
| 200 |
- { (exit 1); exit 1; }; } |
| 201 |
- fi |
| 202 |
- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" |
| 203 |
- fi |
| 204 |
- |
| 205 |
- CFLAGS="$SAVE_CFLAGS" |
| 206 |
- LDFLAGS="$SAVE_LDFLAGS" |
| 207 |
- LIBSOUND="$LIBSOUND $ALSA_LIBS" |
| 208 |
- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" |
| 209 |
- |
| 210 |
-cat >>confdefs.h <<\_ACEOF |
| 211 |
-#define HAVE_ALSA 1 |
| 212 |
-_ACEOF |
| 213 |
- |
| 214 |
- fi |
| 215 |
- |
| 216 |
-fi |
| 217 |
- |
| 218 |
- |
| 219 |
- |
| 220 |
- |
| 221 |
- |
| 222 |
|
| 223 |
|
| 224 |
|
| 225 |
@@ -20694,7 +20486,7 @@ |
| 226 |
$as_echo_n "(cached) " >&6 |
| 227 |
else |
| 228 |
ac_check_lib_save_LIBS=$LIBS |
| 229 |
-LIBS="-lintl $LIBS" |
| 230 |
+#LIBS="-lintl $LIBS" |
| 231 |
cat >conftest.$ac_ext <<_ACEOF |
| 232 |
/* confdefs.h. */ |
| 233 |
_ACEOF |
| 234 |
@@ -20758,7 +20550,7 @@ |
| 235 |
#define HAVE_STRFTIME 1 |
| 236 |
_ACEOF |
| 237 |
|
| 238 |
-LIBS="-lintl $LIBS" |
| 239 |
+#LIBS="-lintl $LIBS" |
| 240 |
fi |
| 241 |
|
| 242 |
fi |
| 243 |
@@ -23660,83 +23452,6 @@ |
| 244 |
|
| 245 |
fi |
| 246 |
|
| 247 |
-# Solaris requires -lintl if you want strerror (which calls dgettext) |
| 248 |
-# to return localized messages. |
| 249 |
- |
| 250 |
-{ $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 |
| 251 |
-$as_echo_n "checking for dgettext in -lintl... " >&6; } |
| 252 |
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then |
| 253 |
- $as_echo_n "(cached) " >&6 |
| 254 |
-else |
| 255 |
- ac_check_lib_save_LIBS=$LIBS |
| 256 |
-LIBS="-lintl $LIBS" |
| 257 |
-cat >conftest.$ac_ext <<_ACEOF |
| 258 |
-/* confdefs.h. */ |
| 259 |
-_ACEOF |
| 260 |
-cat confdefs.h >>conftest.$ac_ext |
| 261 |
-cat >>conftest.$ac_ext <<_ACEOF |
| 262 |
-/* end confdefs.h. */ |
| 263 |
- |
| 264 |
-/* Override any GCC internal prototype to avoid an error. |
| 265 |
- Use char because int might match the return type of a GCC |
| 266 |
- builtin and then its argument prototype would still apply. */ |
| 267 |
-#ifdef __cplusplus |
| 268 |
-extern "C" |
| 269 |
-#endif |
| 270 |
-char dgettext (); |
| 271 |
-int |
| 272 |
-main () |
| 273 |
-{ |
| 274 |
-return dgettext (); |
| 275 |
- ; |
| 276 |
- return 0; |
| 277 |
-} |
| 278 |
-_ACEOF |
| 279 |
-rm -f conftest.$ac_objext conftest$ac_exeext |
| 280 |
-if { (ac_try="$ac_link" |
| 281 |
-case "(($ac_try" in |
| 282 |
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 283 |
- *) ac_try_echo=$ac_try;; |
| 284 |
-esac |
| 285 |
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 286 |
-$as_echo "$ac_try_echo") >&5 |
| 287 |
- (eval "$ac_link") 2>conftest.er1 |
| 288 |
- ac_status=$? |
| 289 |
- grep -v '^ *+' conftest.er1 >conftest.err |
| 290 |
- rm -f conftest.er1 |
| 291 |
- cat conftest.err >&5 |
| 292 |
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 293 |
- (exit $ac_status); } && { |
| 294 |
- test -z "$ac_c_werror_flag" || |
| 295 |
- test ! -s conftest.err |
| 296 |
- } && test -s conftest$ac_exeext && { |
| 297 |
- test "$cross_compiling" = yes || |
| 298 |
- $as_test_x conftest$ac_exeext |
| 299 |
- }; then |
| 300 |
- ac_cv_lib_intl_dgettext=yes |
| 301 |
-else |
| 302 |
- $as_echo "$as_me: failed program was:" >&5 |
| 303 |
-sed 's/^/| /' conftest.$ac_ext >&5 |
| 304 |
- |
| 305 |
- ac_cv_lib_intl_dgettext=no |
| 306 |
-fi |
| 307 |
- |
| 308 |
-rm -rf conftest.dSYM |
| 309 |
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 310 |
- conftest$ac_exeext conftest.$ac_ext |
| 311 |
-LIBS=$ac_check_lib_save_LIBS |
| 312 |
-fi |
| 313 |
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 |
| 314 |
-$as_echo "$ac_cv_lib_intl_dgettext" >&6; } |
| 315 |
-if test $ac_cv_lib_intl_dgettext = yes; then |
| 316 |
- cat >>confdefs.h <<_ACEOF |
| 317 |
-#define HAVE_LIBINTL 1 |
| 318 |
-_ACEOF |
| 319 |
- |
| 320 |
- LIBS="-lintl $LIBS" |
| 321 |
- |
| 322 |
-fi |
| 323 |
- |
| 324 |
|
| 325 |
{ $as_echo "$as_me:$LINENO: checking whether localtime caches TZ" >&5 |
| 326 |
$as_echo_n "checking whether localtime caches TZ... " >&6; } |