~ubuntu-branches/ubuntu/natty/alsa-utils/natty : revision 57

1

diff -urN alsa-utils-1.0.20/aclocal.m4 alsa-utils-1.0.20.new/aclocal.m4

2

--- alsa-utils-1.0.20/aclocal.m4 2009-08-21 09:44:11.000000000 +1000

3

+++ alsa-utils-1.0.20.new/aclocal.m4 2009-08-21 09:45:09.000000000 +1000

1

diff -urN alsa-utils-1.0.21/aclocal.m4 alsa-utils-1.0.21.new/aclocal.m4

2

--- alsa-utils-1.0.21/aclocal.m4 2009-09-01 01:14:21.000000000 +1000

3

+++ alsa-utils-1.0.21.new/aclocal.m4 2009-11-05 16:02:21.000000000 +1100

4

@@ -1,7 +1,7 @@

5

-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-

6

+# generated automatically by aclocal 1.11 -*- Autoconf -*-

743

# Check how to create a tarball. -*- Autoconf -*-

744

745

746

diff -urN alsa-utils-1.0.20/alsaconf/po/ja.po alsa-utils-1.0.20.new/alsaconf/po/ja.po

747

--- alsa-utils-1.0.20/alsaconf/po/ja.po 2009-05-06 17:07:24.000000000 +1000

748

+++ alsa-utils-1.0.20.new/alsaconf/po/ja.po 1970-01-01 10:00:00.000000000 +1000

746

diff -urN alsa-utils-1.0.21/alsaconf/po/ja.po alsa-utils-1.0.21.new/alsaconf/po/ja.po

747

--- alsa-utils-1.0.21/alsaconf/po/ja.po 2009-09-01 01:13:36.000000000 +1000

748

+++ alsa-utils-1.0.21.new/alsaconf/po/ja.po 1970-01-01 10:00:00.000000000 +1000

749

@@ -1,362 +0,0 @@

750

-# SOME DESCRIPTIVE TITLE.

751

-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER

1109

-" PnP または PCI カードが検出されませんでした。\n"

1110

-"\n"

1111

-" 旧式の ISA サウンドカードの検出を行いますか？\n"

1112

diff -urN alsa-utils-1.0.20/alsaconf/po/Makefile.in alsa-utils-1.0.20.new/alsaconf/po/Makefile.in

1113

--- alsa-utils-1.0.20/alsaconf/po/Makefile.in 2009-05-06 17:07:24.000000000 +1000

1114

+++ alsa-utils-1.0.20.new/alsaconf/po/Makefile.in 1970-01-01 10:00:00.000000000 +1000

1112

diff -urN alsa-utils-1.0.21/alsaconf/po/Makefile.in alsa-utils-1.0.21.new/alsaconf/po/Makefile.in

1113

--- alsa-utils-1.0.21/alsaconf/po/Makefile.in 2009-09-01 01:13:36.000000000 +1000

1114

+++ alsa-utils-1.0.21.new/alsaconf/po/Makefile.in 1970-01-01 10:00:00.000000000 +1000

1115

@@ -1,91 +0,0 @@

1116

-POFILES = ja.po ru.po

1117

-

1204

-

1205

-distclean: clean

1206

- rm -f Makefile *~

1207

diff -urN alsa-utils-1.0.20/alsaconf/po/ru.po alsa-utils-1.0.20.new/alsaconf/po/ru.po

1208

--- alsa-utils-1.0.20/alsaconf/po/ru.po 2009-05-06 17:07:24.000000000 +1000

1209

+++ alsa-utils-1.0.20.new/alsaconf/po/ru.po 1970-01-01 10:00:00.000000000 +1000

1207

diff -urN alsa-utils-1.0.21/alsaconf/po/ru.po alsa-utils-1.0.21.new/alsaconf/po/ru.po

1208

--- alsa-utils-1.0.21/alsaconf/po/ru.po 2009-09-01 01:13:36.000000000 +1000

1209

+++ alsa-utils-1.0.21.new/alsaconf/po/ru.po 1970-01-01 10:00:00.000000000 +1000

1210

@@ -1,373 +0,0 @@

1211

-# Russian translations for alsa-utils package

1212

-# Английские переводы для пакета alsa-utils.

1581

-"\n"

1582

-" Желаете проверить ISA звуковые карты/чипы?\n"

1583

-"\n"

1584

diff -urN alsa-utils-1.0.20/alsactl/init/Makefile.in alsa-utils-1.0.20.new/alsactl/init/Makefile.in

1585

--- alsa-utils-1.0.20/alsactl/init/Makefile.in 2009-08-21 09:44:11.000000000 +1000

1586

+++ alsa-utils-1.0.20.new/alsactl/init/Makefile.in 2009-08-21 09:45:09.000000000 +1000

1584

diff -urN alsa-utils-1.0.21/alsactl/init/Makefile.in alsa-utils-1.0.21.new/alsactl/init/Makefile.in

1585

--- alsa-utils-1.0.21/alsactl/init/Makefile.in 2009-09-01 01:14:23.000000000 +1000

1586

+++ alsa-utils-1.0.21.new/alsactl/init/Makefile.in 2009-11-05 16:02:23.000000000 +1100

1587

@@ -1,8 +1,9 @@

1588

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

1589

+# Makefile.in generated by automake 1.11 from Makefile.am.

1924

1925

# Tell versions [3.59,3.63) of GNU make to not export all variables.

1926

# Otherwise a system limit (for SysV at least) may be exceeded.

1927

diff -urN alsa-utils-1.0.20/alsactl/Makefile.in alsa-utils-1.0.20.new/alsactl/Makefile.in

1928

--- alsa-utils-1.0.20/alsactl/Makefile.in 2009-08-21 09:44:11.000000000 +1000

1929

+++ alsa-utils-1.0.20.new/alsactl/Makefile.in 2009-08-21 09:45:09.000000000 +1000

1927

diff -urN alsa-utils-1.0.21/alsactl/Makefile.in alsa-utils-1.0.21.new/alsactl/Makefile.in

1928

--- alsa-utils-1.0.21/alsactl/Makefile.in 2009-09-01 01:14:23.000000000 +1000

1929

+++ alsa-utils-1.0.21.new/alsactl/Makefile.in 2009-11-05 16:02:23.000000000 +1100

1930

@@ -1,8 +1,9 @@

1931

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

1932

+# Makefile.in generated by automake 1.11 from Makefile.am.

2717

# Tell versions [3.59,3.63) of GNU make to not export all variables.

2718

# Otherwise a system limit (for SysV at least) may be exceeded.

2719

.NOEXPORT:

2720

diff -urN alsa-utils-1.0.20/alsamixer/Makefile.in alsa-utils-1.0.20.new/alsamixer/Makefile.in

2721

--- alsa-utils-1.0.20/alsamixer/Makefile.in 2009-08-21 09:44:11.000000000 +1000

2722

+++ alsa-utils-1.0.20.new/alsamixer/Makefile.in 2009-08-21 09:45:09.000000000 +1000

2720

diff -urN alsa-utils-1.0.21/alsamixer/Makefile.in alsa-utils-1.0.21.new/alsamixer/Makefile.in

2721

--- alsa-utils-1.0.21/alsamixer/Makefile.in 2009-09-01 01:14:24.000000000 +1000

2722

+++ alsa-utils-1.0.21.new/alsamixer/Makefile.in 2009-11-05 16:02:23.000000000 +1100

2723

@@ -1,8 +1,9 @@

2724

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

2725

+# Makefile.in generated by automake 1.11 from Makefile.am.

2750

install_sh_DATA = $(install_sh) -c -m 644

2751

install_sh_PROGRAM = $(install_sh) -c

2752

install_sh_SCRIPT = $(install_sh) -c

2753

@@ -51,22 +49,44 @@

2753

@@ -51,8 +49,8 @@

2754

mkinstalldirs = $(install_sh) -d

2755

CONFIG_HEADER = $(top_builddir)/include/aconfig.h

2756

CONFIG_CLEAN_FILES =

2758

am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"

2759

-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

2760

PROGRAMS = $(bin_PROGRAMS)

2761

alsamixer_SOURCES = alsamixer.c

2762

alsamixer_OBJECTS = alsamixer.$(OBJEXT)

2761

am_alsamixer_OBJECTS = card_select.$(OBJEXT) cli.$(OBJEXT) \

2762

colors.$(OBJEXT) device_name.$(OBJEXT) die.$(OBJEXT) \

2763

@@ -63,15 +61,37 @@

2764

alsamixer_OBJECTS = $(am_alsamixer_OBJECTS)

2763

2765

alsamixer_LDADD = $(LDADD)

2764

2766

alsamixer_DEPENDENCIES =

2765

2767

-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include

2771

2773

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

2772

2774

CCLD = $(CC)

2773

2775

LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

2774

SOURCES = alsamixer.c

2775

DIST_SOURCES = alsamixer.c

2776

SOURCES = $(alsamixer_SOURCES)

2777

DIST_SOURCES = $(alsamixer_SOURCES)

2776

2778

+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

2777

2779

+am__vpath_adj = case $$p in \

2778

2780

+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

2797

2799

man1dir = $(mandir)/man1

2798

2800

NROFF = nroff

2799

2801

MANS = $(man_MANS)

2800

@@ -74,14 +94,8 @@

2802

@@ -79,14 +99,8 @@

2801

2803

CTAGS = ctags

2802

2804

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

2803

2805

ACLOCAL = @ACLOCAL@

2812

2814

AMTAR = @AMTAR@

2813

2815

AUTOCONF = @AUTOCONF@

2814

2816

AUTOHEADER = @AUTOHEADER@

2815

@@ -106,14 +120,7 @@

2817

@@ -111,14 +125,7 @@

2816

2818

GMSGFMT = @GMSGFMT@

2817

2819

GMSGFMT_015 = @GMSGFMT_015@

2818

2820

GREP = @GREP@

2828

2830

INSTALL_DATA = @INSTALL_DATA@

2829

2831

INSTALL_PROGRAM = @INSTALL_PROGRAM@

2830

2832

INSTALL_SCRIPT = @INSTALL_SCRIPT@

2831

@@ -131,6 +138,7 @@

2833

@@ -136,6 +143,7 @@

2832

2834

LTLIBINTL = @LTLIBINTL@

2833

2835

LTLIBOBJS = @LTLIBOBJS@

2834

2836

MAKEINFO = @MAKEINFO@

2836

2838

MSGFMT = @MSGFMT@

2837

2839

MSGFMT_015 = @MSGFMT_015@

2838

2840

MSGMERGE = @MSGMERGE@

2839

@@ -140,6 +148,7 @@

2841

@@ -145,6 +153,7 @@

2840

2842

PACKAGE_NAME = @PACKAGE_NAME@

2841

2843

PACKAGE_STRING = @PACKAGE_STRING@

2842

2844

PACKAGE_TARNAME = @PACKAGE_TARNAME@

2844

2846

PACKAGE_VERSION = @PACKAGE_VERSION@

2845

2847

PATH_SEPARATOR = @PATH_SEPARATOR@

2846

2848

POSUB = @POSUB@

2847

@@ -152,14 +161,14 @@

2849

@@ -157,14 +166,14 @@

2848

2850

STRIP = @STRIP@

2849

2851

TESTSOUND = @TESTSOUND@

2850

2852

USE_NLS = @USE_NLS@

2863

2865

am__include = @am__include@

2864

2866

am__leading_dot = @am__leading_dot@

2865

2867

am__quote = @am__quote@

2866

@@ -171,6 +180,7 @@

2868

@@ -176,6 +185,7 @@

2867

2869

build_cpu = @build_cpu@

2868

2870

build_os = @build_os@

2869

2871

build_vendor = @build_vendor@

2871

2873

datadir = @datadir@

2872

2874

datarootdir = @datarootdir@

2873

2875

docdir = @docdir@

2874

@@ -200,8 +210,12 @@

2876

@@ -205,8 +215,12 @@

2875

2877

psdir = @psdir@

2876

2878

sbindir = @sbindir@

2877

2879

sharedstatedir = @sharedstatedir@

2884

2886

xmlto = @xmlto@

2885

2887

AM_CFLAGS = @CURSES_CFLAGS@ -DCURSESINC="@CURSESINC@"

2886

2888

LDADD = @CURSESLIB@

2887

@@ -216,14 +230,14 @@

2889

@@ -236,14 +250,14 @@

2888

2890

@for dep in $?; do \

2889

2891

case '$(am__configure_deps)' in \

2890

2892

*$$dep*) \

2904

2906

.PRECIOUS: Makefile

2905

2907

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

2906

2908

@case '$?' in \

2907

@@ -241,32 +255,47 @@

2909

@@ -261,32 +275,47 @@

2908

2910

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

2909

2911

$(ACLOCAL_M4): $(am__aclocal_m4_deps)

2910

2912

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

2968

2970

2969

2971

mostlyclean-compile:

2970

2972

-rm -f *.$(OBJEXT)

2971

@@ -277,137 +306,149 @@

2972

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsamixer.Po@am__quote@

2973

@@ -310,137 +339,149 @@

2974

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widget.Po@am__quote@

2973

2975

2974

2976

.c.o:

2975

2977

-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

3198

3200

|| exit 1; \

3199

3201

fi; \

3200

3202

done

3201

@@ -416,7 +457,7 @@

3203

@@ -449,7 +490,7 @@

3202

3204

all-am: Makefile $(PROGRAMS) $(MANS)

3203

3205

installdirs:

3204

3206

for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \

3207

3209

done

3208

3210

install: install-am

3209

3211

install-exec: install-exec-am

3210

@@ -438,6 +479,7 @@

3212

@@ -471,6 +512,7 @@

3211

3213

3212

3214

distclean-generic:

3213

3215

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

3215

3217

3216

3218

maintainer-clean-generic:

3217

3219

@echo "This command is intended for maintainers to use"

3218

@@ -458,18 +500,38 @@

3220

@@ -491,18 +533,38 @@

3219

3221

3220

3222

html: html-am

3221

3223

3254

3256

installcheck-am:

3255

3257

3256

3258

maintainer-clean: maintainer-clean-am

3257

@@ -489,25 +551,30 @@

3259

@@ -522,25 +584,30 @@

3258

3260

3259

3261

ps-am:

3260

3262

3288

3290

# Tell versions [3.59,3.63) of GNU make to not export all variables.

3289

3291

# Otherwise a system limit (for SysV at least) may be exceeded.

3290

3292

.NOEXPORT:

3291

diff -urN alsa-utils-1.0.20/amidi/Makefile.in alsa-utils-1.0.20.new/amidi/Makefile.in

3292

--- alsa-utils-1.0.20/amidi/Makefile.in 2009-08-21 09:44:11.000000000 +1000

3293

+++ alsa-utils-1.0.20.new/amidi/Makefile.in 2009-08-21 09:45:09.000000000 +1000

3293

diff -urN alsa-utils-1.0.21/amidi/Makefile.in alsa-utils-1.0.21.new/amidi/Makefile.in

3294

--- alsa-utils-1.0.21/amidi/Makefile.in 2009-09-01 01:14:24.000000000 +1000

3295

+++ alsa-utils-1.0.21.new/amidi/Makefile.in 2009-11-05 16:02:23.000000000 +1100

3294

3296

@@ -1,8 +1,9 @@

3295

3297

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

3296

3298

+# Makefile.in generated by automake 1.11 from Makefile.am.

3854

3856

3855

3857

# Tell versions [3.59,3.63) of GNU make to not export all variables.

3856

3858

# Otherwise a system limit (for SysV at least) may be exceeded.

3857

diff -urN alsa-utils-1.0.20/amixer/Makefile.in alsa-utils-1.0.20.new/amixer/Makefile.in

3858

--- alsa-utils-1.0.20/amixer/Makefile.in 2009-08-21 09:44:11.000000000 +1000

3859

+++ alsa-utils-1.0.20.new/amixer/Makefile.in 2009-08-21 09:45:09.000000000 +1000

3859

diff -urN alsa-utils-1.0.21/amixer/Makefile.in alsa-utils-1.0.21.new/amixer/Makefile.in

3860

--- alsa-utils-1.0.21/amixer/Makefile.in 2009-09-01 01:14:24.000000000 +1000

3861

+++ alsa-utils-1.0.21.new/amixer/Makefile.in 2009-11-05 16:02:23.000000000 +1100

3860

3862

@@ -1,8 +1,9 @@

3861

3863

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

3862

3864

+# Makefile.in generated by automake 1.11 from Makefile.am.

4421

4423

4422

4424

# Tell versions [3.59,3.63) of GNU make to not export all variables.

4423

4425

# Otherwise a system limit (for SysV at least) may be exceeded.

4424

diff -urN alsa-utils-1.0.20/aplay/Makefile.in alsa-utils-1.0.20.new/aplay/Makefile.in

4425

--- alsa-utils-1.0.20/aplay/Makefile.in 2009-08-21 09:44:11.000000000 +1000

4426

+++ alsa-utils-1.0.20.new/aplay/Makefile.in 2009-08-21 09:45:09.000000000 +1000

4426

diff -urN alsa-utils-1.0.21/aplay/Makefile.in alsa-utils-1.0.21.new/aplay/Makefile.in

4427

--- alsa-utils-1.0.21/aplay/Makefile.in 2009-09-01 01:14:24.000000000 +1000

4428

+++ alsa-utils-1.0.21.new/aplay/Makefile.in 2009-11-05 16:02:23.000000000 +1100

4427

4429

@@ -1,8 +1,9 @@

4428

4430

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

4429

4431

+# Makefile.in generated by automake 1.11 from Makefile.am.

5002

5004

# Tell versions [3.59,3.63) of GNU make to not export all variables.

5003

5005

# Otherwise a system limit (for SysV at least) may be exceeded.

5004

5006

.NOEXPORT:

5005

diff -urN alsa-utils-1.0.20/configure alsa-utils-1.0.20.new/configure

5006

--- alsa-utils-1.0.20/configure 2009-08-21 09:44:11.000000000 +1000

5007

+++ alsa-utils-1.0.20.new/configure 2009-08-21 09:45:09.000000000 +1000

5007

diff -urN alsa-utils-1.0.21/configure alsa-utils-1.0.21.new/configure

5008

--- alsa-utils-1.0.21/configure 2009-09-01 01:14:25.000000000 +1000

5009

+++ alsa-utils-1.0.21.new/configure 2009-11-05 16:02:22.000000000 +1100

5008

5010

@@ -1,56 +1,81 @@

5009

5011

#! /bin/sh

5010

5012

# Guess values for system-dependent variables and create Makefiles.

5602

5604

-

5603

5605

-

5604

5606

-fi

5607

-

5608

-fi

5605

5609

+ as_fn_append ()

5606

5610

+ {

5607

5611

+ eval $1=\$$1\$2

5608

5612

+ }

5609

5613

+fi # as_fn_append

5610

5614

5611

-fi

5612

5615

+# as_fn_arith ARG...

5613

5616

+# ------------------

5614

5617

+# Perform arithmetic evaluation on the ARGs, and store the result in the

5627

5630

+fi # as_fn_arith

5628

5631

5629

5632

5630

+# as_fn_error ERROR [LINENO LOG_FD]

5631

+# ---------------------------------

5632

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

5633

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

5634

+# script with status $?, using 1 if that was 0.

5635

+as_fn_error ()

5636

+{

5637

+ as_status=$?; test $as_status -eq 0 && as_status=1

5638

+ if test "$3"; then

5639

+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

5640

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

5641

+ fi

5642

+ $as_echo "$as_me: error: $1" >&2

5643

+ as_fn_exit $as_status

5644

+} # as_fn_error

5645

5646

5633

-(eval "as_func_return () {

5647

5634

- (exit \$1)

5648

5635

-}

5658

5645

-as_func_ret_failure () {

5659

5646

- return 1

5660

5647

-}

5661

-

5648

+# as_fn_error ERROR [LINENO LOG_FD]

5649

+# ---------------------------------

5650

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

5651

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

5652

+# script with status $?, using 1 if that was 0.

5653

+as_fn_error ()

5654

+{

5655

+ as_status=$?; test $as_status -eq 0 && as_status=1

5656

+ if test "$3"; then

5657

+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

5658

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

5659

+ fi

5660

+ $as_echo "$as_me: error: $1" >&2

5661

+ as_fn_exit $as_status

5662

+} # as_fn_error

5663

5662

5664

-exitcode=0

5663

5665

-if as_func_success; then

5664

5666

- :

5836

5838

else

5837

5839

as_ln_s='cp -p'

5838

5840

fi

5839

@@ -506,201 +488,231 @@

5841

@@ -506,25 +488,34 @@

5840

5842

rmdir conf$$.dir 2>/dev/null

5841

5843

5842

5844

if mkdir -p . 2>/dev/null; then

5883

5885

5884

5886

# Sed expression to map a string onto a valid CPP name.

5885

5887

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

5886

5887

-# Sed expression to map a string onto a valid variable name.

5888

-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

5889

-

5890

-

5891

-

5892

-exec 7<&0 </dev/null 6>&1

5893

-

5894

-# Name of the host.

5895

-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

5896

-# so uname gets run too.

5897

-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`

5898

-

5899

-#

5900

-# Initializations.

5901

-#

5902

-ac_default_prefix=/usr/local

5903

-ac_clean_files=

5904

-ac_config_libobj_dir=.

5905

-LIBOBJS=

5906

-cross_compiling=no

5907

-subdirs=

5908

-MFLAGS=

5909

-MAKEFLAGS=

5888

@@ -533,7 +524,6 @@

5889

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

5890

5891

5892

-

5893

exec 7<&0 </dev/null 6>&1

5894

5895

# Name of the host.

5896

@@ -552,7 +542,6 @@

5897

subdirs=

5898

MFLAGS=

5899

MAKEFLAGS=

5910

5900

-SHELL=${CONFIG_SHELL-/bin/sh}

5911

-

5912

-# Identity of this package.

5913

-PACKAGE_NAME=

5914

-PACKAGE_TARNAME=

5915

-PACKAGE_VERSION=

5916

-PACKAGE_STRING=

5917

-PACKAGE_BUGREPORT=

5918

-

5919

-ac_unique_file="alsamixer/alsamixer.c"

5920

-ac_default_prefix=/usr

5901

5902

# Identity of this package.

5903

PACKAGE_NAME=

5904

@@ -560,183 +549,206 @@

5905

PACKAGE_VERSION=

5906

PACKAGE_STRING=

5907

PACKAGE_BUGREPORT=

5908

+PACKAGE_URL=

5909

5910

ac_unique_file="aplay/aplay.c"

5911

ac_default_prefix=/usr

5912

# Factoring default headers for most tests.

5913

ac_includes_default="\

5914

#include <stdio.h>

5915

-#if HAVE_SYS_TYPES_H

5916

+#ifdef HAVE_SYS_TYPES_H

5917

# include <sys/types.h>

5918

-#endif

5919

-#if HAVE_SYS_STAT_H

5920

-# include <sys/stat.h>

5921

-#endif

5922

-#if STDC_HEADERS

5923

-# include <stdlib.h>

5924

-# include <stddef.h>

5925

-#else

5926

-# if HAVE_STDLIB_H

5927

-# include <stdlib.h>

5928

-# endif

5929

-#endif

5930

-#if HAVE_STRING_H

5931

-# if !STDC_HEADERS && HAVE_MEMORY_H

5932

-# include <memory.h>

5933

-# endif

5934

-# include <string.h>

5935

-#endif

5936

-#if HAVE_STRINGS_H

5937

-# include <strings.h>

5938

-#endif

5939

-#if HAVE_INTTYPES_H

5940

-# include <inttypes.h>

5941

-#endif

5942

-#if HAVE_STDINT_H

5943

-# include <stdint.h>

5944

-#endif

5945

-#if HAVE_UNISTD_H

5946

-# include <unistd.h>

5947

-#endif"

5948

-

5921

5949

-ac_subst_vars='SHELL

5922

5950

-PATH_SEPARATOR

5923

5951

-PACKAGE_NAME

6047

6075

-SND_UTIL_MINOR

6048

6076

-SND_UTIL_SUBMINOR

6049

6077

-LIBRT

6050

+# Sed expression to map a string onto a valid variable name.

6051

+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

6052

+

6053

+

6054

+exec 7<&0 </dev/null 6>&1

6055

+

6056

+# Name of the host.

6057

+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

6058

+# so uname gets run too.

6059

+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`

6060

+

6061

+#

6062

+# Initializations.

6063

+#

6064

+ac_default_prefix=/usr/local

6065

+ac_clean_files=

6066

+ac_config_libobj_dir=.

6067

+LIBOBJS=

6068

+cross_compiling=no

6069

+subdirs=

6070

+MFLAGS=

6071

+MAKEFLAGS=

6072

+

6073

+# Identity of this package.

6074

+PACKAGE_NAME=

6075

+PACKAGE_TARNAME=

6076

+PACKAGE_VERSION=

6077

+PACKAGE_STRING=

6078

+PACKAGE_BUGREPORT=

6079

+PACKAGE_URL=

6080

+

6081

+ac_unique_file="alsamixer/alsamixer.c"

6082

+ac_default_prefix=/usr

6078

+#endif

6079

+#ifdef HAVE_SYS_STAT_H

6080

+# include <sys/stat.h>

6081

+#endif

6082

+#ifdef STDC_HEADERS

6083

+# include <stdlib.h>

6084

+# include <stddef.h>

6085

+#else

6086

+# ifdef HAVE_STDLIB_H

6087

+# include <stdlib.h>

6088

+# endif

6089

+#endif

6090

+#ifdef HAVE_STRING_H

6091

+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

6092

+# include <memory.h>

6093

+# endif

6094

+# include <string.h>

6095

+#endif

6096

+#ifdef HAVE_STRINGS_H

6097

+# include <strings.h>

6098

+#endif

6099

+#ifdef HAVE_INTTYPES_H

6100

+# include <inttypes.h>

6101

+#endif

6102

+#ifdef HAVE_STDINT_H

6103

+# include <stdint.h>

6104

+#endif

6105

+#ifdef HAVE_UNISTD_H

6106

+# include <unistd.h>

6107

+#endif"

6108

+

6083

6109

+ac_subst_vars='am__EXEEXT_FALSE

6084

6110

+am__EXEEXT_TRUE

6085

6111

+LTLIBOBJS

6244

6270

CPPFLAGS

6245

6271

CPP'

6246

6272

6247

@@ -708,6 +720,8 @@

6273

@@ -744,6 +756,8 @@

6248

6274

# Initialize some variables set by options.

6249

6275

ac_init_help=

6250

6276

ac_init_version=false

6253

6279

# The variables have the same names as the options, with

6254

6280

# dashes changed to underlines.

6255

6281

cache_file=/dev/null

6256

@@ -806,13 +820,20 @@

6282

@@ -842,13 +856,20 @@

6257

6283

datarootdir=$ac_optarg ;;

6258

6284

6259

6285

-disable-* | --disable-*)

6280

6306

6281

6307

-docdir | --docdir | --docdi | --doc | --do)

6282

6308

ac_prev=docdir ;;

6283

@@ -825,13 +846,20 @@

6309

@@ -861,13 +882,20 @@

6284

6310

dvidir=$ac_optarg ;;

6285

6311

6286

6312

-enable-* | --enable-*)

6307

6333

6308

6334

-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \

6309

6335

6310

@@ -1022,22 +1050,36 @@

6336

@@ -1058,22 +1086,36 @@

6311

6337

ac_init_version=: ;;

6312

6338

6313

6339

-with-* | --with-*)

6356

6382

6357

6383

--x)

6358

6384

# Obsolete; use --with-x.

6359

@@ -1057,25 +1099,25 @@

6385

@@ -1093,25 +1135,25 @@

6360

6386

6361

6387

x_libraries=$ac_optarg ;;

6362

6388

6390

6416

: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

6391

6417

;;

6392

6418

6393

@@ -1084,23 +1126,36 @@

6419

@@ -1120,23 +1162,36 @@

6394

6420

6395

6421

if test -n "$ac_prev"; then

6396

6422

ac_option=--`echo $ac_prev | sed 's/_/-/g'`

6432

6458

done

6433

6459

6434

6460

# There might be people who depend on the old broken behavior: `$host'

6435

@@ -1114,7 +1169,7 @@

6461

@@ -1150,7 +1205,7 @@

6436

6462

if test "x$host_alias" != x; then

6437

6463

if test "x$build_alias" = x; then

6438

6464

cross_compiling=maybe

6441

6467

If a cross compiler is detected then cross compile mode will be used." >&2

6442

6468

elif test "x$build_alias" != "x$host_alias"; then

6443

6469

cross_compiling=yes

6444

@@ -1130,23 +1185,21 @@

6470

@@ -1166,23 +1221,21 @@

6445

6471

ac_pwd=`pwd` && test -n "$ac_pwd" &&

6446

6472

ac_ls_di=`ls -di .` &&

6447

6473

ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||

6473

6499

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

6474

6500

s//\1/

6475

6501

q

6476

@@ -1173,13 +1226,11 @@

6502

@@ -1209,13 +1262,11 @@

6477

6503

fi

6478

6504

if test ! -r "$srcdir/$ac_unique_file"; then

6479

6505

test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."

6489

6515

pwd)`

6490

6516

# When building in place, set srcdir=.

6491

6517

if test "$ac_abs_confdir" = "$ac_pwd"; then

6492

@@ -1227,9 +1278,9 @@

6518

@@ -1263,9 +1314,9 @@

6493

6519

6494

6520

Installation directories:

6495

6521

--prefix=PREFIX install architecture-independent files in PREFIX

6501

6527

6502

6528

By default, \`make install' will install all the files in

6503

6529

\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify

6504

@@ -1239,25 +1290,25 @@

6530

@@ -1275,25 +1326,25 @@

6505

6531

For better control, use the options below.

6506

6532

6507

6533

Fine tuning of the installation directories:

6546

6572

_ACEOF

6547

6573

6548

6574

cat <<\_ACEOF

6549

@@ -1278,6 +1329,7 @@

6575

@@ -1314,6 +1365,7 @@

6550

6576

cat <<\_ACEOF

6551

6577

6552

6578

Optional Features:

6554

6580

--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)

6555

6581

--enable-FEATURE[=ARG] include FEATURE [ARG=yes]

6556

6582

--disable-nls do not use Native Language Support

6557

@@ -1286,7 +1338,6 @@

6583

@@ -1322,7 +1374,6 @@

6558

6584

--disable-rpath do not hardcode runtime library paths

6559

6585

--disable-alsatest Do not try to compile and run a test Alsa program

6560

6586

--disable-alsamixer Disable alsamixer compilation

6562

6588

--disable-xmlto Disable man page creation via xmlto

6563

6589

--disable-largefile omit support for large files

6564

6590

6565

@@ -1309,6 +1360,7 @@

6591

@@ -1345,6 +1396,7 @@

6566

6592

CFLAGS C compiler flags

6567

6593

LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a

6568

6594

nonstandard directory <lib dir>

6570

6596

CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if

6571

6597

you have headers in a nonstandard directory <include dir>

6572

6598

CPP C preprocessor

6573

@@ -1316,6 +1368,7 @@

6599

@@ -1352,6 +1404,7 @@

6574

6600

Use these variables to override the choices made by `configure' or to help

6575

6601

it to find libraries and programs with nonstandard names/locations.

6576

6602

6578

6604

_ACEOF

6579

6605

ac_status=$?

6580

6606

fi

6581

@@ -1323,15 +1376,17 @@

6607

@@ -1359,15 +1412,17 @@

6582

6608

if test "$ac_init_help" = "recursive"; then

6583

6609

# If there are subdirs, report their specific --help.

6584

6610

for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue

6599

6625

case $ac_top_builddir_sub in

6600

6626

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

6601

6627

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

6602

@@ -1358,40 +1413,237 @@

6603

esac

6604

ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

6605

6606

- cd "$ac_dir" || { ac_status=$?; continue; }

6607

- # Check for guested configure.

6608

- if test -f "$ac_srcdir/configure.gnu"; then

6609

- echo &&

6610

- $SHELL "$ac_srcdir/configure.gnu" --help=recursive

6611

- elif test -f "$ac_srcdir/configure"; then

6612

- echo &&

6613

- $SHELL "$ac_srcdir/configure" --help=recursive

6614

- else

6628

@@ -1403,7 +1458,7 @@

6629

echo &&

6630

$SHELL "$ac_srcdir/configure" --help=recursive

6631

else

6615

6632

- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

6616

- fi || ac_status=$?

6617

- cd "$ac_pwd" || { ac_status=$?; break; }

6618

- done

6619

+ cd "$ac_dir" || { ac_status=$?; continue; }

6620

+ # Check for guested configure.

6621

+ if test -f "$ac_srcdir/configure.gnu"; then

6622

+ echo &&

6623

+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive

6624

+ elif test -f "$ac_srcdir/configure"; then

6625

+ echo &&

6626

+ $SHELL "$ac_srcdir/configure" --help=recursive

6627

+ else

6628

6633

+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

6629

+ fi || ac_status=$?

6630

+ cd "$ac_pwd" || { ac_status=$?; break; }

6631

+ done

6632

+fi

6633

+

6634

+test -n "$ac_init_help" && exit $ac_status

6635

+if $ac_init_version; then

6636

+ cat <<\_ACEOF

6637

+configure

6634

fi || ac_status=$?

6635

cd "$ac_pwd" || { ac_status=$?; break; }

6636

done

6637

@@ -1413,21 +1468,305 @@

6638

if $ac_init_version; then

6639

cat <<\_ACEOF

6640

configure

6641

-generated by GNU Autoconf 2.60

6638

6642

+generated by GNU Autoconf 2.64

6639

+

6643

6644

6645

-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

6640

6646

6641

+This configure script is free software; the Free Software Foundation

6642

+gives unlimited permission to copy, distribute and modify it.

6643

+_ACEOF

6644

+ exit

6645

+fi

6647

This configure script is free software; the Free Software Foundation

6648

gives unlimited permission to copy, distribute and modify it.

6649

_ACEOF

6650

exit

6651

fi

6646

6652

+

6647

6653

+## ------------------------ ##

6648

6654

+## Autoconf initialization. ##

6835

6841

+sed 's/^/| /' conftest.$ac_ext >&5

6836

6842

+

6837

6843

+ ac_retval=$ac_status

6838

fi

6844

+fi

6839

6845

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

6840

6846

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

6841

6847

+ return $ac_retval

6842

6843

-test -n "$ac_init_help" && exit $ac_status

6844

-if $ac_init_version; then

6845

- cat <<\_ACEOF

6846

-configure

6847

-generated by GNU Autoconf 2.60

6848

-

6849

6850

-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

6851

-This configure script is free software; the Free Software Foundation

6852

-gives unlimited permission to copy, distribute and modify it.

6853

-_ACEOF

6854

- exit

6855

-fi

6848

+

6856

6849

+} # ac_fn_c_try_run

6850

+

6851

+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES

6852

+# -------------------------------------------------------

6853

+# Tests whether HEADER exists, giving a warning if it cannot be compiled using

6854

+# the include files in INCLUDES and setting the cache variable VAR

6855

+# accordingly.

6856

+ac_fn_c_check_header_mongrel ()

6857

+{

6858

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

6859

+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

6860

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

6861

+$as_echo_n "checking for $2... " >&6; }

6862

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

6863

+ $as_echo_n "(cached) " >&6

6864

+fi

6865

+eval ac_res=\$$3

6866

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

6867

+$as_echo "$ac_res" >&6; }

6868

+else

6869

+ # Is the header compilable?

6870

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5

6871

+$as_echo_n "checking $2 usability... " >&6; }

6872

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6873

+/* end confdefs.h. */

6874

+$4

6875

+#include <$2>

6876

+_ACEOF

6877

+if ac_fn_c_try_compile "$LINENO"; then :

6878

+ ac_header_compiler=yes

6879

+else

6880

+ ac_header_compiler=no

6881

+fi

6882

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6883

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5

6884

+$as_echo "$ac_header_compiler" >&6; }

6885

+

6886

+# Is the header present?

6887

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5

6888

+$as_echo_n "checking $2 presence... " >&6; }

6889

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6890

+/* end confdefs.h. */

6891

+#include <$2>

6892

+_ACEOF

6893

+if ac_fn_c_try_cpp "$LINENO"; then :

6894

+ ac_header_preproc=yes

6895

+else

6896

+ ac_header_preproc=no

6897

+fi

6898

+rm -f conftest.err conftest.$ac_ext

6899

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

6900

+$as_echo "$ac_header_preproc" >&6; }

6901

+

6902

+# So? What about this header?

6903

+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((

6904

+ yes:no: )

6905

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5

6906

+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}

6907

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

6908

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

6909

+ ;;

6910

+ no:yes:* )

6911

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5

6912

+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}

6913

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5

6914

+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}

6915

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5

6916

+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}

6917

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5

6918

+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}

6919

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

6920

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

6921

+ ;;

6922

+esac

6923

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

6924

+$as_echo_n "checking for $2... " >&6; }

6925

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

6926

+ $as_echo_n "(cached) " >&6

6927

+else

6928

+ eval "$3=\$ac_header_compiler"

6929

+fi

6930

+eval ac_res=\$$3

6931

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

6932

+$as_echo "$ac_res" >&6; }

6933

+fi

6934

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

6935

+

6936

+} # ac_fn_c_check_header_mongrel

6857

6937

cat >config.log <<_ACEOF

6858

6938

This file contains any messages produced by compilers while

6859

6939

running configure, to aid debugging if configure makes a mistake.

6864

6944

6865

6945

$ $0 $@

6866

6946

6867

@@ -1427,8 +1679,8 @@

6947

@@ -1463,8 +1802,8 @@

6868

6948

do

6869

6949

IFS=$as_save_IFS

6870

6950

test -z "$as_dir" && as_dir=.

6875

6955

IFS=$as_save_IFS

6876

6956

6877

6957

} >&5

6878

@@ -1462,12 +1714,12 @@

6958

@@ -1498,12 +1837,12 @@

6879

6959

6880

6960

continue ;;

6881

6961

*\'*)

6891

6971

if test $ac_must_keep_next = true; then

6892

6972

ac_must_keep_next=false # Got value, back to normal.

6893

6973

else

6894

@@ -1483,13 +1735,13 @@

6974

@@ -1519,13 +1858,13 @@

6895

6975

-* ) ac_must_keep_next=true ;;

6896

6976

esac

6897

6977

fi

6908

6988

6909

6989

# When interrupted or exit'd, cleanup temporary files, and complete

6910

6990

# config.log. We remove comments because anyway the quotes in there

6911

@@ -1514,12 +1766,13 @@

6991

@@ -1550,12 +1889,13 @@

6912

6992

case $ac_val in #(

6913

6993

*${as_nl}*)

6914

6994

case $ac_var in #(

6925

7005

esac ;;

6926

7006

esac

6927

7007

done

6928

@@ -1548,9 +1801,9 @@

7008

@@ -1584,9 +1924,9 @@

6929

7009

do

6930

7010

eval ac_val=\$$ac_var

6931

7011

case $ac_val in

6937

7017

done | sort

6938

7018

echo

6939

7019

6940

@@ -1565,9 +1818,9 @@

7020

@@ -1601,9 +1941,9 @@

6941

7021

do

6942

7022

eval ac_val=\$$ac_var

6943

7023

case $ac_val in

6949

7029

done | sort

6950

7030

echo

6951

7031

fi

6952

@@ -1583,64 +1836,69 @@

7032

@@ -1619,64 +1959,69 @@

6953

7033

echo

6954

7034

fi

6955

7035

test "$ac_signal" != 0 &&

7035

7115

sed 's/^/| /' "$ac_site_file" >&5

7036

7116

. "$ac_site_file"

7037

7117

fi

7038

@@ -1650,16 +1908,16 @@

7118

@@ -1686,16 +2031,16 @@

7039

7119

# Some versions of bash will fail to source /dev/null (special

7040

7120

# files actually), so we avoid doing that.

7041

7121

if test -f "$cache_file"; then

7056

7136

>$cache_file

7057

7137

fi

7058

7138

7059

@@ -1673,60 +1931,56 @@

7139

@@ -1709,60 +2054,56 @@

7060

7140

eval ac_new_val=\$ac_env_${ac_var}_value

7061

7141

case $ac_old_set,$ac_new_set in

7062

7142

set,)

7148

7228

7149

7229

ac_ext=c

7150

7230

ac_cpp='$CPP $CPPFLAGS'

7151

@@ -1736,27 +1990,20 @@

7231

@@ -1772,27 +2113,20 @@

7152

7232

7153

7233

7154

7234

7186

7266

fi

7187

7267

7188

7268

# These three variables are undocumented and unsupported,

7189

@@ -1781,22 +2028,23 @@

7269

@@ -1817,22 +2151,23 @@

7190

7270

# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

7191

7271

# OS/2's system install, which has a completely different semantic

7192

7272

# ./install, which can be erroneously created by make from ./install.sh.

7218

7298

/usr/ucb/* ) ;;

7219

7299

*)

7220

7300

# OSF1 and SCO ODT 3.0 have their own names for install.

7221

@@ -1804,7 +2052,7 @@

7301

@@ -1840,7 +2175,7 @@

7222

7302

# by default.

7223

7303

for ac_prog in ginstall scoinst install; do

7224

7304

for ac_exec_ext in '' $ac_executable_extensions; do

7227

7307

if test $ac_prog = install &&

7228

7308

grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

7229

7309

# AIX install. It has an incompatible calling convention.

7230

@@ -1814,17 +2062,29 @@

7310

@@ -1850,17 +2185,29 @@

7231

7311

# program-specific install script used by HP pwplus--don't use.

7232

7312

:

7233

7313

else

7260

7340

7261

7341

fi

7262

7342

if test "${ac_cv_path_install+set}" = set; then

7263

@@ -1837,8 +2097,8 @@

7343

@@ -1873,8 +2220,8 @@

7264

7344

INSTALL=$ac_install_sh

7265

7345

fi

7266

7346

fi

7271

7351

7272

7352

# Use test -z because SunOS4 sh mishandles braces in ${var-val}.

7273

7353

# It thinks the first close brace ends the variable substitution.

7274

@@ -1848,21 +2108,34 @@

7354

@@ -1884,21 +2231,34 @@

7275

7355

7276

7356

test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

7277

7357

7310

7390

fi

7311

7391

rm -f conftest.file

7312

7392

if test "$*" != "X $srcdir/configure conftest.file" \

7313

@@ -1872,11 +2145,8 @@

7393

@@ -1908,11 +2268,8 @@

7314

7394

# if, for instance, CONFIG_SHELL is bash and it inherits a

7315

7395

# broken ls alias from the environment. This has actually

7316

7396

# happened. Such a system could not be considered "sane".

7324

7404

fi

7325

7405

7326

7406

test "$2" = conftest.file

7327

@@ -1885,81 +2155,206 @@

7407

@@ -1921,81 +2278,206 @@

7328

7408

# Ok.

7329

7409

:

7330

7410

else

7579

7659

else

7580

7660

if test -n "$AWK"; then

7581

7661

ac_cv_prog_AWK="$AWK" # Let the user override the test.

7582

@@ -1969,36 +2364,37 @@

7662

@@ -2005,36 +2487,37 @@

7583

7663

do

7584

7664

IFS=$as_save_IFS

7585

7665

test -z "$as_dir" && as_dir=.

7630

7710

else

7631

7711

cat >conftest.make <<\_ACEOF

7632

7712

SHELL = /bin/sh

7633

@@ -2015,12 +2411,12 @@

7713

@@ -2051,12 +2534,12 @@

7634

7714

rm -f conftest.make

7635

7715

fi

7636

7716

if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then

7647

7727

SET_MAKE="MAKE=${MAKE-make}"

7648

7728

fi

7649

7729

7650

@@ -2033,12 +2429,14 @@

7730

@@ -2069,12 +2552,14 @@

7651

7731

fi

7652

7732

rmdir .tst 2>/dev/null

7653

7733

7668

7748

fi

7669

7749

7670

7750

# test whether we have cygpath

7671

@@ -2081,112 +2479,6 @@

7751

@@ -2117,112 +2602,6 @@

7672

7752

7673

7753

MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

7674

7754

7781

7861

# We need awk for the "check" target. The system "awk" is bad on

7782

7862

# some platforms.

7783

7863

# Always define AMTAR for backward compatibility.

7784

@@ -2201,17 +2493,17 @@

7864

@@ -2237,17 +2616,17 @@

7785

7865

7786

7866

7787

7867

7804

7884

7805

7885

7806

7886

7807

@@ -2248,10 +2540,10 @@

7887

@@ -2284,10 +2663,10 @@

7808

7888

7809

7889

# Extract the first word of "msgfmt", so it can be a program name with args.

7810

7890

set dummy msgfmt; ac_word=$2

7819

7899

else

7820

7900

case "$MSGFMT" in

7821

7901

[\\/]* | ?:[\\/]*)

7822

@@ -2280,19 +2572,19 @@

7902

@@ -2316,19 +2695,19 @@

7823

7903

fi

7824

7904

MSGFMT="$ac_cv_path_MSGFMT"

7825

7905

if test "$MSGFMT" != ":"; then

7847

7927

else

7848

7928

case $GMSGFMT in

7849

7929

[\\/]* | ?:[\\/]*)

7850

@@ -2304,14 +2596,14 @@

7930

@@ -2340,14 +2719,14 @@

7851

7931

do

7852

7932

IFS=$as_save_IFS

7853

7933

test -z "$as_dir" && as_dir=.

7866

7946

IFS=$as_save_IFS

7867

7947

7868

7948

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

7869

@@ -2320,11 +2612,11 @@

7949

@@ -2356,11 +2735,11 @@

7870

7950

fi

7871

7951

GMSGFMT=$ac_cv_path_GMSGFMT

7872

7952

if test -n "$GMSGFMT"; then

7882

7962

fi

7883

7963

7884

7964

7885

@@ -2371,10 +2663,10 @@

7965

@@ -2407,10 +2786,10 @@

7886

7966

7887

7967

# Extract the first word of "xgettext", so it can be a program name with args.

7888

7968

set dummy xgettext; ac_word=$2

7897

7977

else

7898

7978

case "$XGETTEXT" in

7899

7979

[\\/]* | ?:[\\/]*)

7900

@@ -2403,11 +2695,11 @@

7980

@@ -2439,11 +2818,11 @@

7901

7981

fi

7902

7982

XGETTEXT="$ac_cv_path_XGETTEXT"

7903

7983

if test "$XGETTEXT" != ":"; then

7913

7993

fi

7914

7994

7915

7995

rm -f messages.po

7916

@@ -2449,10 +2741,10 @@

7996

@@ -2485,10 +2864,10 @@

7917

7997

7918

7998

# Extract the first word of "msgmerge", so it can be a program name with args.

7919

7999

set dummy msgmerge; ac_word=$2

7928

8008

else

7929

8009

case "$MSGMERGE" in

7930

8010

[\\/]* | ?:[\\/]*)

7931

@@ -2480,11 +2772,11 @@

8011

@@ -2516,11 +2895,11 @@

7932

8012

fi

7933

8013

MSGMERGE="$ac_cv_path_MSGMERGE"

7934

8014

if test "$MSGMERGE" != ":"; then

7944

8024

fi

7945

8025

7946

8026

7947

@@ -2518,44 +2810,44 @@

8027

@@ -2554,44 +2933,44 @@

7948

8028

am_make=${MAKE-make}

7949

8029

cat > confinc << 'END'

7950

8030

am__doit:

8010

8090

enableval=$enable_dependency_tracking;

8011

8091

fi

8012

8092

8013

@@ -2563,9 +2855,7 @@

8093

@@ -2599,9 +2978,7 @@

8014

8094

am_depcomp="$ac_aux_dir/depcomp"

8015

8095

AMDEPBACKSLASH='\'

8016

8096

fi

8021

8101

AMDEP_TRUE=

8022

8102

AMDEP_FALSE='#'

8023

8103

else

8024

@@ -2574,7 +2864,6 @@

8104

@@ -2610,7 +2987,6 @@

8025

8105

fi

8026

8106

8027

8107

8029

8109

ac_ext=c

8030

8110

ac_cpp='$CPP $CPPFLAGS'

8031

8111

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

8032

@@ -2583,10 +2872,10 @@

8112

@@ -2619,10 +2995,10 @@

8033

8113

if test -n "$ac_tool_prefix"; then

8034

8114

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

8035

8115

set dummy ${ac_tool_prefix}gcc; ac_word=$2

8044

8124

else

8045

8125

if test -n "$CC"; then

8046

8126

ac_cv_prog_CC="$CC" # Let the user override the test.

8047

@@ -2596,25 +2885,25 @@

8127

@@ -2632,25 +3008,25 @@

8048

8128

do

8049

8129

IFS=$as_save_IFS

8050

8130

test -z "$as_dir" && as_dir=.

8078

8158

fi

8079

8159

8080

8160

8081

@@ -2623,10 +2912,10 @@

8161

@@ -2659,10 +3035,10 @@

8082

8162

ac_ct_CC=$CC

8083

8163

# Extract the first word of "gcc", so it can be a program name with args.

8084

8164

set dummy gcc; ac_word=$2

8093

8173

else

8094

8174

if test -n "$ac_ct_CC"; then

8095

8175

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

8096

@@ -2636,25 +2925,25 @@

8176

@@ -2672,25 +3048,25 @@

8097

8177

do

8098

8178

IFS=$as_save_IFS

8099

8179

test -z "$as_dir" && as_dir=.

8127

8207

fi

8128

8208

8129

8209

if test "x$ac_ct_CC" = x; then

8130

@@ -2662,12 +2951,8 @@

8210

@@ -2698,12 +3074,8 @@

8131

8211

else

8132

8212

case $cross_compiling:$ac_tool_warned in

8133

8213

yes:)

8142

8222

ac_tool_warned=yes ;;

8143

8223

esac

8144

8224

CC=$ac_ct_CC

8145

@@ -2680,10 +2965,10 @@

8225

@@ -2716,10 +3088,10 @@

8146

8226

if test -n "$ac_tool_prefix"; then

8147

8227

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

8148

8228

set dummy ${ac_tool_prefix}cc; ac_word=$2

8157

8237

else

8158

8238

if test -n "$CC"; then

8159

8239

ac_cv_prog_CC="$CC" # Let the user override the test.

8160

@@ -2693,25 +2978,25 @@

8240

@@ -2729,25 +3101,25 @@

8161

8241

do

8162

8242

IFS=$as_save_IFS

8163

8243

test -z "$as_dir" && as_dir=.

8191

8271

fi

8192

8272

8193

8273

8194

@@ -2720,10 +3005,10 @@

8274

@@ -2756,10 +3128,10 @@

8195

8275

if test -z "$CC"; then

8196

8276

# Extract the first word of "cc", so it can be a program name with args.

8197

8277

set dummy cc; ac_word=$2

8206

8286

else

8207

8287

if test -n "$CC"; then

8208

8288

ac_cv_prog_CC="$CC" # Let the user override the test.

8209

@@ -2734,18 +3019,18 @@

8289

@@ -2770,18 +3142,18 @@

8210

8290

do

8211

8291

IFS=$as_save_IFS

8212

8292

test -z "$as_dir" && as_dir=.

8229

8309

IFS=$as_save_IFS

8230

8310

8231

8311

if test $ac_prog_rejected = yes; then

8232

@@ -2764,11 +3049,11 @@

8312

@@ -2800,11 +3172,11 @@

8233

8313

fi

8234

8314

CC=$ac_cv_prog_CC

8235

8315

if test -n "$CC"; then

8245

8325

fi

8246

8326

8247

8327

8248

@@ -2779,10 +3064,10 @@

8328

@@ -2815,10 +3187,10 @@

8249

8329

do

8250

8330

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

8251

8331

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

8260

8340

else

8261

8341

if test -n "$CC"; then

8262

8342

ac_cv_prog_CC="$CC" # Let the user override the test.

8263

@@ -2792,25 +3077,25 @@

8343

@@ -2828,25 +3200,25 @@

8264

8344

do

8265

8345

IFS=$as_save_IFS

8266

8346

test -z "$as_dir" && as_dir=.

8294

8374

fi

8295

8375

8296

8376

8297

@@ -2823,10 +3108,10 @@

8377

@@ -2859,10 +3231,10 @@

8298

8378

do

8299

8379

# Extract the first word of "$ac_prog", so it can be a program name with args.

8300

8380

set dummy $ac_prog; ac_word=$2

8309

8389

else

8310

8390

if test -n "$ac_ct_CC"; then

8311

8391

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

8312

@@ -2836,25 +3121,25 @@

8392

@@ -2872,25 +3244,25 @@

8313

8393

do

8314

8394

IFS=$as_save_IFS

8315

8395

test -z "$as_dir" && as_dir=.

8343

8423

fi

8344

8424

8345

8425

8346

@@ -2866,12 +3151,8 @@

8426

@@ -2902,12 +3274,8 @@

8347

8427

else

8348

8428

case $cross_compiling:$ac_tool_warned in

8349

8429

yes:)

8358

8438

ac_tool_warned=yes ;;

8359

8439

esac

8360

8440

CC=$ac_ct_CC

8361

@@ -2881,115 +3162,99 @@

8441

@@ -2917,115 +3285,99 @@

8362

8442

fi

8363

8443

8364

8444

8367

8447

-echo "$as_me: error: no acceptable C compiler found in \$PATH

8368

8448

-See \`config.log' for more details." >&2;}

8369

8449

- { (exit 1); exit 1; }; }

8370

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

8371

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

8372

+as_fn_error "no acceptable C compiler found in \$PATH

8373

+See \`config.log' for more details." "$LINENO" 5; }

8374

8375

# Provide some information about the compiler.

8450

-

8451

-# Provide some information about the compiler.

8376

8452

-echo "$as_me:$LINENO: checking for C compiler version" >&5

8377

8453

-ac_compiler=`set X $ac_compile; echo $2`

8378

8454

-{ (ac_try="$ac_compiler --version >&5"

8386

8462

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8387

8463

- (exit $ac_status); }

8388

8464

-{ (ac_try="$ac_compiler -v >&5"

8465

-case "(($ac_try" in

8466

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8467

- *) ac_try_echo=$ac_try;;

8468

-esac

8469

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8470

- (eval "$ac_compiler -v >&5") 2>&5

8471

- ac_status=$?

8472

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8473

- (exit $ac_status); }

8474

-{ (ac_try="$ac_compiler -V >&5"

8475

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

8476

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

8477

+as_fn_error "no acceptable C compiler found in \$PATH

8478

+See \`config.log' for more details." "$LINENO" 5; }

8479

+

8480

+# Provide some information about the compiler.

8389

8481

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

8390

8482

+set X $ac_compile

8391

8483

+ac_compiler=$2

8396

8488

*) ac_try_echo=$ac_try;;

8397

8489

esac

8398

8490

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8399

- (eval "$ac_compiler -v >&5") 2>&5

8491

- (eval "$ac_compiler -V >&5") 2>&5

8400

8492

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

8401

8493

+$as_echo "$ac_try_echo"; } >&5

8402

8494

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

8403

8495

ac_status=$?

8404

8496

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8405

8497

- (exit $ac_status); }

8406

-{ (ac_try="$ac_compiler -V >&5"

8407

-case "(($ac_try" in

8408

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8409

- *) ac_try_echo=$ac_try;;

8410

-esac

8411

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8412

- (eval "$ac_compiler -V >&5") 2>&5

8413

- ac_status=$?

8414

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8415

- (exit $ac_status); }

8416

8498

+ if test -s conftest.err; then

8417

8499

+ sed '10a\

8418

8500

+... rest of stderr output deleted ...

8517

8599

then :; else

8518

8600

ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

8519

8601

fi

8520

@@ -3006,76 +3271,77 @@

8602

@@ -3042,76 +3394,77 @@

8521

8603

test "$ac_cv_exeext" = no && ac_cv_exeext=

8522

8604

8523

8605

else

8576

8658

cross_compiling=yes

8577

8659

else

8578

8660

- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.

8661

-If you meant to cross compile, use \`--host'.

8662

-See \`config.log' for more details." >&5

8663

-echo "$as_me: error: cannot run C compiled programs.

8579

8664

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

8580

8665

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

8581

8666

+as_fn_error "cannot run C compiled programs.

8582

8667

If you meant to cross compile, use \`--host'.

8583

-See \`config.log' for more details." >&5

8584

-echo "$as_me: error: cannot run C compiled programs.

8585

-If you meant to cross compile, use \`--host'.

8586

8668

-See \`config.log' for more details." >&2;}

8587

8669

- { (exit 1); exit 1; }; }

8588

8670

+See \`config.log' for more details." "$LINENO" 5; }

8631

8713

# If both `conftest.exe' and `conftest' are `present' (well, observable)

8632

8714

# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will

8633

8715

# work properly (i.e., refer to `conftest.exe'), while it won't with

8634

@@ -3083,37 +3349,31 @@

8716

@@ -3119,37 +3472,31 @@

8635

8717

for ac_file in conftest.exe conftest conftest.*; do

8636

8718

test -f "$ac_file" || continue

8637

8719

case $ac_file in

8681

8763

/* end confdefs.h. */

8682

8764

8683

8765

int

8684

@@ -3125,51 +3385,46 @@

8766

@@ -3161,51 +3508,46 @@

8685

8767

}

8686

8768

_ACEOF

8687

8769

rm -f conftest.o conftest.obj

8751

8833

/* end confdefs.h. */

8752

8834

8753

8835

int

8754

@@ -3183,71 +3438,34 @@

8836

@@ -3219,71 +3561,34 @@

8755

8837

return 0;

8756

8838

}

8757

8839

_ACEOF

8837

8919

/* end confdefs.h. */

8838

8920

8839

8921

int

8840

@@ -3258,51 +3476,11 @@

8922

@@ -3294,51 +3599,11 @@

8841

8923

return 0;

8842

8924

}

8843

8925

_ACEOF

8892

8974

/* end confdefs.h. */

8893

8975

8894

8976

int

8895

@@ -3313,52 +3491,12 @@

8977

@@ -3349,52 +3614,12 @@

8896

8978

return 0;

8897

8979

}

8898

8980

_ACEOF

8949

9031

/* end confdefs.h. */

8950

9032

8951

9033

int

8952

@@ -3369,59 +3507,18 @@

9034

@@ -3405,59 +3630,18 @@

8953

9035

return 0;

8954

9036

}

8955

9037

_ACEOF

9012

9094

if test "$ac_test_CFLAGS" = set; then

9013

9095

CFLAGS=$ac_save_CFLAGS

9014

9096

elif test $ac_cv_prog_cc_g = yes; then

9015

@@ -3437,18 +3534,14 @@

9097

@@ -3473,18 +3657,14 @@

9016

9098

CFLAGS=

9017

9099

fi

9018

9100

fi

9036

9118

/* end confdefs.h. */

9037

9119

#include <stdarg.h>

9038

9120

#include <stdio.h>

9039

@@ -3505,48 +3598,9 @@

9121

@@ -3541,48 +3721,9 @@

9040

9122

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

9041

9123

do

9042

9124

CC="$ac_save_CC $ac_arg"

9086

9168

rm -f core conftest.err conftest.$ac_objext

9087

9169

test "x$ac_cv_prog_cc_c89" != "xno" && break

9088

9170

done

9089

@@ -3557,17 +3611,19 @@

9171

@@ -3593,17 +3734,19 @@

9090

9172

# AC_CACHE_VAL

9091

9173

case "x$ac_cv_prog_cc_c89" in

9092

9174

x)

9112

9194

9113

9195

ac_ext=c

9114

9196

ac_cpp='$CPP $CPPFLAGS'

9115

@@ -3577,10 +3633,10 @@

9197

@@ -3613,10 +3756,10 @@

9116

9198

9117

9199

depcc="$CC" am_compiler_list=

9118

9200

9127

9209

else

9128

9210

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

9129

9211

# We make a subdir and do the tests there. Otherwise we can end up

9130

@@ -3605,6 +3661,11 @@

9212

@@ -3641,6 +3784,11 @@

9131

9213

if test "$am_compiler_list" = ""; then

9132

9214

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

9133

9215

fi

9139

9221

for depmode in $am_compiler_list; do

9140

9222

# Setup a source with many dependencies, because some compilers

9141

9223

# like to wrap large dependency lists on column 80 (with \), and

9142

@@ -3622,7 +3683,17 @@

9224

@@ -3658,7 +3806,17 @@

9143

9225

done

9144

9226

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

9145

9227

9157

9239

nosideeffect)

9158

9240

# after this tag, mechanisms are not by side-effect, so they'll

9159

9241

# only be used when explicitly requested

9160

@@ -3632,18 +3703,23 @@

9242

@@ -3668,18 +3826,23 @@

9161

9243

break

9162

9244

fi

9163

9245

;;

9187

9269

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

9188

9270

# icc doesn't choke on unknown options, it will just issue warnings

9189

9271

# or remarks (even with -Werror). So we grep stderr for any message

9190

@@ -3667,13 +3743,11 @@

9272

@@ -3703,13 +3866,11 @@

9191

9273

fi

9192

9274

9193

9275

fi

9204

9286

test "x$enable_dependency_tracking" != xno \

9205

9287

&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then

9206

9288

am__fastdepCC_TRUE=

9207

@@ -3686,35 +3760,27 @@

9289

@@ -3722,35 +3883,27 @@

9208

9290

9209

9291

# Make sure we can run config.sub.

9210

9292

$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

9251

9333

esac

9252

9334

build=$ac_cv_build

9253

9335

ac_save_IFS=$IFS; IFS='-'

9254

@@ -3730,28 +3796,24 @@

9336

@@ -3766,28 +3919,24 @@

9255

9337

case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac

9256

9338

9257

9339

9288

9370

esac

9289

9371

host=$ac_cv_host

9290

9372

ac_save_IFS=$IFS; IFS='-'

9291

@@ -3769,7 +3831,7 @@

9373

@@ -3805,7 +3954,7 @@

9292

9374

9293

9375

9294

9376

# Check whether --with-gnu-ld was given.

9297

9379

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

9298

9380

else

9299

9381

with_gnu_ld=no

9300

@@ -3791,8 +3853,8 @@

9382

@@ -3827,8 +3976,8 @@

9301

9383

ac_prog=ld

9302

9384

if test "$GCC" = yes; then

9303

9385

# Check if gcc -print-prog-name=ld gives a path.

9308

9390

case $host in

9309

9391

*-*-mingw*)

9310

9392

# gcc leaves a trailing carriage return which upsets mingw

9311

@@ -3821,14 +3883,14 @@

9393

@@ -3857,14 +4006,14 @@

9312

9394

;;

9313

9395

esac

9314

9396

elif test "$with_gnu_ld" = yes; then

9329

9411

else

9330

9412

if test -z "$LD"; then

9331

9413

IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"

9332

@@ -3855,19 +3917,17 @@

9414

@@ -3891,19 +4040,17 @@

9333

9415

9334

9416

LD="$acl_cv_path_LD"

9335

9417

if test -n "$LD"; then

9358

9440

else

9359

9441

# I'd rather use --version here, but apparently some GNU ld's only accept -v.

9360

9442

case `$LD -v 2>&1 </dev/null` in

9361

@@ -3877,17 +3937,17 @@

9443

@@ -3913,17 +4060,17 @@

9362

9444

acl_cv_prog_gnu_ld=no ;;

9363

9445

esac

9364

9446

fi

9382

9464

else

9383

9465

9384

9466

CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \

9385

@@ -3897,8 +3957,8 @@

9467

@@ -3933,8 +4080,8 @@

9386

9468

acl_cv_rpath=done

9387

9469

9388

9470

fi

9393

9475

wl="$acl_cv_wl"

9394

9476

libext="$acl_cv_libext"

9395

9477

shlibext="$acl_cv_shlibext"

9396

@@ -3907,7 +3967,7 @@

9478

@@ -3943,7 +4090,7 @@

9397

9479

hardcode_direct="$acl_cv_hardcode_direct"

9398

9480

hardcode_minus_L="$acl_cv_hardcode_minus_L"

9399

9481

# Check whether --enable-rpath was given.

9402

9484

enableval=$enable_rpath; :

9403

9485

else

9404

9486

enable_rpath=yes

9405

@@ -3955,7 +4015,7 @@

9487

@@ -3991,7 +4138,7 @@

9406

9488

9407

9489

9408

9490

# Check whether --with-libiconv-prefix was given.

9411

9493

withval=$with_libiconv_prefix;

9412

9494

if test "X$withval" = "Xno"; then

9413

9495

use_additional=no

9414

@@ -4334,18 +4394,14 @@

9496

@@ -4370,18 +4517,14 @@

9415

9497

9416

9498

9417

9499

9435

9517

/* end confdefs.h. */

9436

9518

#include <CoreFoundation/CFPreferences.h>

9437

9519

int

9438

@@ -4356,73 +4412,30 @@

9520

@@ -4392,73 +4535,30 @@

9439

9521

return 0;

9440

9522

}

9441

9523

_ACEOF

9520

9602

/* end confdefs.h. */

9521

9603

#include <CoreFoundation/CFLocale.h>

9522

9604

int

9523

@@ -4433,59 +4446,20 @@

9605

@@ -4469,59 +4569,20 @@

9524

9606

return 0;

9525

9607

}

9526

9608

_ACEOF

9586

9668

9587

9669

fi

9588

9670

INTL_MACOSX_LIBS=

9589

@@ -4510,16 +4484,12 @@

9671

@@ -4546,16 +4607,12 @@

9590

9672

9591

9673

9592

9674

9608

9690

/* end confdefs.h. */

9609

9691

#include <libintl.h>

9610

9692

extern int _nl_msg_cat_cntr;

9611

@@ -4533,53 +4503,16 @@

9693

@@ -4569,53 +4626,16 @@

9612

9694

return 0;

9613

9695

}

9614

9696

_ACEOF

9667

9749

9668

9750

if test "$gt_cv_func_gnugettext1_libc" != "yes"; then

9669

9751

9670

@@ -4612,19 +4545,15 @@

9752

@@ -4648,19 +4668,15 @@

9671

9753

done

9672

9754

9673

9755

9692

9774

/* end confdefs.h. */

9693

9775

#include <stdlib.h>

9694

9776

#include <iconv.h>

9695

@@ -4638,58 +4567,15 @@

9777

@@ -4674,58 +4690,15 @@

9696

9778

return 0;

9697

9779

}

9698

9780

_ACEOF

9754

9836

/* end confdefs.h. */

9755

9837

#include <stdlib.h>

9756

9838

#include <iconv.h>

9757

@@ -4698,74 +4584,33 @@

9758

{

9759

iconv_t cd = iconv_open("","");

9760

iconv(cd,NULL,NULL,NULL,NULL);

9761

- iconv_close(cd);

9762

- ;

9763

- return 0;

9764

-}

9765

-_ACEOF

9839

@@ -4739,69 +4712,28 @@

9840

return 0;

9841

}

9842

_ACEOF

9766

9843

-rm -f conftest.$ac_objext conftest$ac_exeext

9767

9844

-if { (ac_try="$ac_link"

9768

9845

-case "(($ac_try" in

9797

9874

- ac_status=$?

9798

9875

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9799

9876

- (exit $ac_status); }; }; then

9800

+ iconv_close(cd);

9801

+ ;

9802

+ return 0;

9803

+}

9804

+_ACEOF

9805

9877

+if ac_fn_c_try_link "$LINENO"; then :

9806

9878

am_cv_lib_iconv=yes

9807

9879

am_cv_func_iconv=yes

9843

9915

else

9844

9916

CPPFLAGS="$am_save_CPPFLAGS"

9845

9917

LIBICONV=

9846

@@ -4793,7 +4638,7 @@

9918

@@ -4829,7 +4761,7 @@

9847

9919

9848

9920

9849

9921

# Check whether --with-libintl-prefix was given.

9852

9924

withval=$with_libintl_prefix;

9853

9925

if test "X$withval" = "Xno"; then

9854

9926

use_additional=no

9855

@@ -5154,20 +4999,16 @@

9927

@@ -5190,20 +5122,16 @@

9856

9928

done

9857

9929

fi

9858

9930

9878

9950

/* end confdefs.h. */

9879

9951

#include <libintl.h>

9880

9952

extern int _nl_msg_cat_cntr;

9881

@@ -5185,57 +5026,16 @@

9953

@@ -5221,57 +5149,16 @@

9882

9954

return 0;

9883

9955

}

9884

9956

_ACEOF

9940

10012

/* end confdefs.h. */

9941

10013

#include <libintl.h>

9942

10014

extern int _nl_msg_cat_cntr;

9943

@@ -5253,59 +5053,20 @@

10015

@@ -5289,59 +5176,20 @@

9944

10016

return 0;

9945

10017

}

9946

10018

_ACEOF

10004

10076

fi

10005

10077

10006

10078

if test "$gt_cv_func_gnugettext1_libc" = "yes" \

10007

@@ -5332,22 +5093,20 @@

10079

@@ -5368,22 +5216,20 @@

10008

10080

if test "$gt_use_preinstalled_gnugettext" = "yes" \

10009

10081

|| test "$nls_cv_use_gnu_gettext" = "yes"; then

10010

10082

10034

10106

if test "$gt_use_preinstalled_gnugettext" = "yes"; then

10035

10107

if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then

10036

10108

gt_source="external libintl"

10037

@@ -5357,18 +5116,18 @@

10109

@@ -5393,18 +5239,18 @@

10038

10110

else

10039

10111

gt_source="included intl directory"

10040

10112

fi

10059

10131

10060

10132

for element in $INCINTL; do

10061

10133

haveit=

10062

@@ -5395,14 +5154,10 @@

10134

@@ -5431,14 +5277,10 @@

10063

10135

fi

10064

10136

10065

10137

10076

10148

10077

10149

fi

10078

10150

10079

@@ -5423,8 +5178,8 @@

10151

@@ -5459,8 +5301,8 @@

10080

10152

10081

10153

if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`";

10082

10154

then

10087

10159

10088

10160

which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc

10089

10161

which ${target_cpu}-${target_os}-gcc >/dev/null 2>&1 \

10090

@@ -5432,8 +5187,8 @@

10162

@@ -5468,8 +5310,8 @@

10091

10163

which ${target_cpu}-${target_vendor}-${target_os}-gcc >/dev/null 2>&1 \

10092

10164

&& CC=${target_cpu}-${target_vendor}-${target_os}-gcc

10093

10165

10098

10170

fi

10099

10171

10100

10172

ac_ext=c

10101

@@ -5444,10 +5199,10 @@

10173

@@ -5480,10 +5322,10 @@

10102

10174

if test -n "$ac_tool_prefix"; then

10103

10175

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

10104

10176

set dummy ${ac_tool_prefix}gcc; ac_word=$2

10113

10185

else

10114

10186

if test -n "$CC"; then

10115

10187

ac_cv_prog_CC="$CC" # Let the user override the test.

10116

@@ -5457,25 +5212,25 @@

10188

@@ -5493,25 +5335,25 @@

10117

10189

do

10118

10190

IFS=$as_save_IFS

10119

10191

test -z "$as_dir" && as_dir=.

10147

10219

fi

10148

10220

10149

10221

10150

@@ -5484,10 +5239,10 @@

10222

@@ -5520,10 +5362,10 @@

10151

10223

ac_ct_CC=$CC

10152

10224

# Extract the first word of "gcc", so it can be a program name with args.

10153

10225

set dummy gcc; ac_word=$2

10162

10234

else

10163

10235

if test -n "$ac_ct_CC"; then

10164

10236

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

10165

@@ -5497,25 +5252,25 @@

10237

@@ -5533,25 +5375,25 @@

10166

10238

do

10167

10239

IFS=$as_save_IFS

10168

10240

test -z "$as_dir" && as_dir=.

10196

10268

fi

10197

10269

10198

10270

if test "x$ac_ct_CC" = x; then

10199

@@ -5523,12 +5278,8 @@

10271

@@ -5559,12 +5401,8 @@

10200

10272

else

10201

10273

case $cross_compiling:$ac_tool_warned in

10202

10274

yes:)

10211

10283

ac_tool_warned=yes ;;

10212

10284

esac

10213

10285

CC=$ac_ct_CC

10214

@@ -5541,10 +5292,10 @@

10286

@@ -5577,10 +5415,10 @@

10215

10287

if test -n "$ac_tool_prefix"; then

10216

10288

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

10217

10289

set dummy ${ac_tool_prefix}cc; ac_word=$2

10226

10298

else

10227

10299

if test -n "$CC"; then

10228

10300

ac_cv_prog_CC="$CC" # Let the user override the test.

10229

@@ -5554,25 +5305,25 @@

10301

@@ -5590,25 +5428,25 @@

10230

10302

do

10231

10303

IFS=$as_save_IFS

10232

10304

test -z "$as_dir" && as_dir=.

10260

10332

fi

10261

10333

10262

10334

10263

@@ -5581,10 +5332,10 @@

10335

@@ -5617,10 +5455,10 @@

10264

10336

if test -z "$CC"; then

10265

10337

# Extract the first word of "cc", so it can be a program name with args.

10266

10338

set dummy cc; ac_word=$2

10275

10347

else

10276

10348

if test -n "$CC"; then

10277

10349

ac_cv_prog_CC="$CC" # Let the user override the test.

10278

@@ -5595,18 +5346,18 @@

10350

@@ -5631,18 +5469,18 @@

10279

10351

do

10280

10352

IFS=$as_save_IFS

10281

10353

test -z "$as_dir" && as_dir=.

10298

10370

IFS=$as_save_IFS

10299

10371

10300

10372

if test $ac_prog_rejected = yes; then

10301

@@ -5625,11 +5376,11 @@

10373

@@ -5661,11 +5499,11 @@

10302

10374

fi

10303

10375

CC=$ac_cv_prog_CC

10304

10376

if test -n "$CC"; then

10314

10386

fi

10315

10387

10316

10388

10317

@@ -5640,10 +5391,10 @@

10389

@@ -5676,10 +5514,10 @@

10318

10390

do

10319

10391

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

10320

10392

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

10329

10401

else

10330

10402

if test -n "$CC"; then

10331

10403

ac_cv_prog_CC="$CC" # Let the user override the test.

10332

@@ -5653,25 +5404,25 @@

10404

@@ -5689,25 +5527,25 @@

10333

10405

do

10334

10406

IFS=$as_save_IFS

10335

10407

test -z "$as_dir" && as_dir=.

10363

10435

fi

10364

10436

10365

10437

10366

@@ -5684,10 +5435,10 @@

10438

@@ -5720,10 +5558,10 @@

10367

10439

do

10368

10440

# Extract the first word of "$ac_prog", so it can be a program name with args.

10369

10441

set dummy $ac_prog; ac_word=$2

10378

10450

else

10379

10451

if test -n "$ac_ct_CC"; then

10380

10452

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

10381

@@ -5697,25 +5448,25 @@

10453

@@ -5733,25 +5571,25 @@

10382

10454

do

10383

10455

IFS=$as_save_IFS

10384

10456

test -z "$as_dir" && as_dir=.

10412

10484

fi

10413

10485

10414

10486

10415

@@ -5727,12 +5478,8 @@

10487

@@ -5763,12 +5601,8 @@

10416

10488

else

10417

10489

case $cross_compiling:$ac_tool_warned in

10418

10490

yes:)

10427

10499

ac_tool_warned=yes ;;

10428

10500

esac

10429

10501

CC=$ac_ct_CC

10430

@@ -5742,56 +5489,42 @@

10502

@@ -5778,56 +5612,42 @@

10431

10503

fi

10432

10504

10433

10505

10512

10584

/* end confdefs.h. */

10513

10585

10514

10586

int

10515

@@ -5805,71 +5538,34 @@

10587

@@ -5841,71 +5661,34 @@

10516

10588

return 0;

10517

10589

}

10518

10590

_ACEOF

10598

10670

/* end confdefs.h. */

10599

10671

10600

10672

int

10601

@@ -5880,51 +5576,11 @@

10673

@@ -5916,51 +5699,11 @@

10602

10674

return 0;

10603

10675

}

10604

10676

_ACEOF

10653

10725

/* end confdefs.h. */

10654

10726

10655

10727

int

10656

@@ -5935,52 +5591,12 @@

10728

@@ -5971,52 +5714,12 @@

10657

10729

return 0;

10658

10730

}

10659

10731

_ACEOF

10710

10782

/* end confdefs.h. */

10711

10783

10712

10784

int

10713

@@ -5991,59 +5607,18 @@

10785

@@ -6027,59 +5730,18 @@

10714

10786

return 0;

10715

10787

}

10716

10788

_ACEOF

10773

10845

if test "$ac_test_CFLAGS" = set; then

10774

10846

CFLAGS=$ac_save_CFLAGS

10775

10847

elif test $ac_cv_prog_cc_g = yes; then

10776

@@ -6059,18 +5634,14 @@

10848

@@ -6095,18 +5757,14 @@

10777

10849

CFLAGS=

10778

10850

fi

10779

10851

fi

10797

10869

/* end confdefs.h. */

10798

10870

#include <stdarg.h>

10799

10871

#include <stdio.h>

10800

@@ -6127,48 +5698,9 @@

10872

@@ -6163,48 +5821,9 @@

10801

10873

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

10802

10874

do

10803

10875

CC="$ac_save_CC $ac_arg"

10847

10919

rm -f core conftest.err conftest.$ac_objext

10848

10920

test "x$ac_cv_prog_cc_c89" != "xno" && break

10849

10921

done

10850

@@ -6179,17 +5711,19 @@

10922

@@ -6215,17 +5834,19 @@

10851

10923

# AC_CACHE_VAL

10852

10924

case "x$ac_cv_prog_cc_c89" in

10853

10925

x)

10873

10945

10874

10946

ac_ext=c

10875

10947

ac_cpp='$CPP $CPPFLAGS'

10876

@@ -6199,10 +5733,10 @@

10948

@@ -6235,10 +5856,10 @@

10877

10949

10878

10950

depcc="$CC" am_compiler_list=

10879

10951

10888

10960

else

10889

10961

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

10890

10962

# We make a subdir and do the tests there. Otherwise we can end up

10891

@@ -6227,6 +5761,11 @@

10963

@@ -6263,6 +5884,11 @@

10892

10964

if test "$am_compiler_list" = ""; then

10893

10965

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

10894

10966

fi

10900

10972

for depmode in $am_compiler_list; do

10901

10973

# Setup a source with many dependencies, because some compilers

10902

10974

# like to wrap large dependency lists on column 80 (with \), and

10903

@@ -6244,7 +5783,17 @@

10975

@@ -6280,157 +5906,91 @@

10904

10976

done

10905

10977

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

10906

10978

10918

10990

nosideeffect)

10919

10991

# after this tag, mechanisms are not by side-effect, so they'll

10920

10992

# only be used when explicitly requested

10921

@@ -6254,18 +5803,23 @@

10922

break

10923

fi

10924

;;

10925

+ msvisualcpp | msvcmsys)

10926

+ # This compiler won't grok `-c -o', but also, the minuso test has

10927

+ # not run yet. These depmodes are late enough in the game, and

10928

+ # so weak that their functioning should not be impacted.

10929

+ am__obj=conftest.${OBJEXT-o}

10930

+ am__minus_obj=

10931

+ ;;

10932

none) break ;;

10933

esac

10993

- if test "x$enable_dependency_tracking" = xyes; then

10994

- continue

10995

- else

10996

- break

10997

- fi

10998

- ;;

10999

- none) break ;;

11000

- esac

10934

11001

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

10935

11002

- # mode. It turns out that the SunPro C++ compiler does not properly

10936

11003

- # handle `-M -o', and we need to detect this.

10937

if depmode=$depmode \

11004

- if depmode=$depmode \

10938

11005

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

10939

+ source=sub/conftest.c object=$am__obj \

10940

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

11006

- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

10941

11007

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

10942

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

10943

>/dev/null 2>conftest.err &&

10944

+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

10945

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

11008

- >/dev/null 2>conftest.err &&

11009

- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

10946

11010

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

10947

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

10948

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

10949

# icc doesn't choke on unknown options, it will just issue warnings

10950

# or remarks (even with -Werror). So we grep stderr for any message

10951

@@ -6285,116 +5839,35 @@

10952

cd ..

10953

rm -rf conftest.dir

10954

else

11011

- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

11012

- # icc doesn't choke on unknown options, it will just issue warnings

11013

- # or remarks (even with -Werror). So we grep stderr for any message

11014

- # that says an option was ignored or not supported.

11015

- # When given -MP, icc 7.0 and 7.1 complain thusly:

11016

- # icc: Command line warning: ignoring option '-M'; no argument required

11017

- # The diagnosis changed in icc 8.0:

11018

- # icc: Command line remark: option '-MP' not supported

11019

- if (grep 'ignoring option' conftest.err ||

11020

- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

11021

- am_cv_CC_dependencies_compiler_type=$depmode

11022

- break

11023

- fi

11024

- fi

11025

- done

11026

-

11027

- cd ..

11028

- rm -rf conftest.dir

11029

-else

10955

11030

- am_cv_CC_dependencies_compiler_type=none

10956

11031

-fi

10957

11032

-

11030

11105

-done

11031

11106

-IFS=$as_save_IFS

11032

11107

-

11033

-

11108

+ if test "x$enable_dependency_tracking" = xyes; then

11109

+ continue

11110

+ else

11111

+ break

11112

+ fi

11113

+ ;;

11114

+ msvisualcpp | msvcmsys)

11115

+ # This compiler won't grok `-c -o', but also, the minuso test has

11116

+ # not run yet. These depmodes are late enough in the game, and

11117

+ # so weak that their functioning should not be impacted.

11118

+ am__obj=conftest.${OBJEXT-o}

11119

+ am__minus_obj=

11120

+ ;;

11121

+ none) break ;;

11122

+ esac

11123

+ if depmode=$depmode \

11124

+ source=sub/conftest.c object=$am__obj \

11125

+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

11126

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

11127

+ >/dev/null 2>conftest.err &&

11128

+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

11129

+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

11130

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

11131

+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

11132

+ # icc doesn't choke on unknown options, it will just issue warnings

11133

+ # or remarks (even with -Werror). So we grep stderr for any message

11134

+ # that says an option was ignored or not supported.

11135

+ # When given -MP, icc 7.0 and 7.1 complain thusly:

11136

+ # icc: Command line warning: ignoring option '-M'; no argument required

11137

+ # The diagnosis changed in icc 8.0:

11138

+ # icc: Command line remark: option '-MP' not supported

11139

+ if (grep 'ignoring option' conftest.err ||

11140

+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

11141

+ am_cv_CC_dependencies_compiler_type=$depmode

11142

+ break

11143

+ fi

11144

+ fi

11145

+ done

11146

11147

+ cd ..

11148

+ rm -rf conftest.dir

11149

+else

11034

11150

+ am_cv_CC_dependencies_compiler_type=none

11035

11151

fi

11036

11152

- if test "${ac_cv_path_install+set}" = set; then

11085

11201

fi

11086

11202

11087

11203

alsa_save_CFLAGS="$CFLAGS"

11088

@@ -6404,7 +5877,7 @@

11204

@@ -6440,7 +6000,7 @@

11089

11205

11090

11206

11091

11207

# Check whether --with-alsa-prefix was given.

11094

11210

withval=$with_alsa_prefix; alsa_prefix="$withval"

11095

11211

else

11096

11212

alsa_prefix=""

11097

@@ -6413,7 +5886,7 @@

11213

@@ -6449,7 +6009,7 @@

11098

11214

11099

11215

11100

11216

# Check whether --with-alsa-inc-prefix was given.

11103

11219

withval=$with_alsa_inc_prefix; alsa_inc_prefix="$withval"

11104

11220

else

11105

11221

alsa_inc_prefix=""

11106

@@ -6421,24 +5894,24 @@

11222

@@ -6457,24 +6017,24 @@

11107

11223

11108

11224

11109

11225

# Check whether --enable-alsatest was given.

11135

11251

if test "$alsa_prefix" != "" ; then

11136

11252

ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"

11137

11253

LDFLAGS="$LDFLAGS $ALSA_LIBS"

11138

@@ -6446,12 +5919,12 @@

11254

@@ -6482,12 +6042,12 @@

11139

11255

11140

11256

ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"

11141

11257

LIBS="$ALSA_LIBS $LIBS"

11152

11268

no_alsa=""

11153

11269

alsa_min_major_version=`echo $min_alsa_version | \

11154

11270

sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`

11155

@@ -6467,11 +5940,7 @@

11271

@@ -6503,11 +6063,7 @@

11156

11272

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

11157

11273

ac_compiler_gnu=$ac_cv_c_compiler_gnu

11158

11274

11165

11281

/* end confdefs.h. */

11166

11282

11167

11283

#include <alsa/asoundlib.h>

11168

@@ -6516,55 +5985,16 @@

11284

@@ -6552,55 +6108,16 @@

11169

11285

return 0;

11170

11286

}

11171

11287

_ACEOF

11228

11344

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11229

11345

ac_ext=c

11230

11346

ac_cpp='$CPP $CPPFLAGS'

11231

@@ -6574,19 +6004,14 @@

11347

@@ -6610,19 +6127,14 @@

11232

11348

11233

11349

11234

11350

if test "x$enable_alsatest" = "xyes"; then

11253

11369

/* end confdefs.h. */

11254

11370

11255

11371

/* Override any GCC internal prototype to avoid an error.

11256

@@ -6604,55 +6029,18 @@

11372

@@ -6640,55 +6152,18 @@

11257

11373

return 0;

11258

11374

}

11259

11375

_ACEOF

11315

11431

cat >>confdefs.h <<_ACEOF

11316

11432

#define HAVE_LIBASOUND 1

11317

11433

_ACEOF

11318

@@ -6660,9 +6048,7 @@

11434

@@ -6696,9 +6171,7 @@

11319

11435

LIBS="-lasound $LIBS"

11320

11436

11321

11437

else

11326

11442

alsa_found=no

11327

11443

11328

11444

fi

11329

@@ -6688,75 +6074,13 @@

11445

@@ -6724,75 +6197,13 @@

11330

11446

11331

11447

11332

11448

11407

11523

_ACEOF

11408

11524

have_pcm="yes"

11409

11525

else

11410

@@ -6765,75 +6089,13 @@

11526

@@ -6801,75 +6212,13 @@

11411

11527

11412

11528

done

11413

11529

11488

11604

_ACEOF

11489

11605

have_mixer="yes"

11490

11606

else

11491

@@ -6842,75 +6104,13 @@

11607

@@ -6878,75 +6227,13 @@

11492

11608

11493

11609

done

11494

11610

11569

11685

_ACEOF

11570

11686

have_rawmidi="yes"

11571

11687

else

11572

@@ -6919,75 +6119,13 @@

11688

@@ -6955,75 +6242,13 @@

11573

11689

11574

11690

done

11575

11691

11650

11766

_ACEOF

11651

11767

have_seq="yes"

11652

11768

else

11653

@@ -6997,9 +6135,7 @@

11769

@@ -7033,9 +6258,7 @@

11654

11770

done

11655

11771

11656

11772

11661

11777

HAVE_PCM_TRUE=

11662

11778

HAVE_PCM_FALSE='#'

11663

11779

else

11664

@@ -7007,9 +6143,7 @@

11780

@@ -7043,9 +6266,7 @@

11665

11781

HAVE_PCM_FALSE=

11666

11782

fi

11667

11783

11672

11788

HAVE_MIXER_TRUE=

11673

11789

HAVE_MIXER_FALSE='#'

11674

11790

else

11675

@@ -7017,9 +6151,7 @@

11791

@@ -7053,9 +6274,7 @@

11676

11792

HAVE_MIXER_FALSE=

11677

11793

fi

11678

11794

11683

11799

HAVE_RAWMIDI_TRUE=

11684

11800

HAVE_RAWMIDI_FALSE='#'

11685

11801

else

11686

@@ -7027,9 +6159,7 @@

11802

@@ -7063,9 +6282,7 @@

11687

11803

HAVE_RAWMIDI_FALSE=

11688

11804

fi

11689

11805

11694

11810

HAVE_SEQ_TRUE=

11695

11811

HAVE_SEQ_FALSE='#'

11696

11812

else

11697

@@ -7039,29 +6169,25 @@

11813

@@ -7075,114 +6292,69 @@

11698

11814

11699

11815

11700

11816

LIBRT=""

11732

11848

/* end confdefs.h. */

11733

11849

11734

11850

/* Override any GCC internal prototype to avoid an error.

11735

@@ -7079,74 +6205,33 @@

11736

return 0;

11737

}

11738

_ACEOF

11851

Use char because int might match the return type of a GCC

11852

builtin and then its argument prototype would still apply. */

11853

#ifdef __cplusplus

11854

-extern "C"

11855

-#endif

11856

-char clock_gettime ();

11857

-int

11858

-main ()

11859

-{

11860

-return clock_gettime ();

11861

- ;

11862

- return 0;

11863

-}

11864

-_ACEOF

11739

11865

-rm -f conftest.$ac_objext conftest$ac_exeext

11740

11866

-if { (ac_try="$ac_link"

11741

11867

-case "(($ac_try" in

11770

11896

- ac_status=$?

11771

11897

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11772

11898

- (exit $ac_status); }; }; then

11899

+extern "C"

11900

+#endif

11901

+char clock_gettime ();

11902

+int

11903

+main ()

11904

+{

11905

+return clock_gettime ();

11906

+ ;

11907

+ return 0;

11908

+}

11909

+_ACEOF

11773

11910

+if ac_fn_c_try_link "$LINENO"; then :

11774

11911

ac_cv_lib_rt_clock_gettime=yes

11775

11912

else

11817

11954

fi

11818

11955

11819

11956

CURSESINC=""

11820

@@ -7155,22 +6240,18 @@

11957

@@ -7191,22 +6363,18 @@

11821

11958

alsamixer=

11822

11959

if test "$have_mixer" = "yes"; then

11823

11960

# Check whether --enable-alsamixer was given.

11843

11980

ALSAMIXER_TRUE=

11844

11981

ALSAMIXER_FALSE='#'

11845

11982

else

11846

@@ -7179,34 +6260,10 @@

11983

@@ -7215,34 +6383,10 @@

11847

11984

fi

11848

11985

11849

11986

11879

12016

enableval=$enable_xmlto; xmlto="$enableval"

11880

12017

else

11881

12018

xmlto="yes"

11882

@@ -7215,10 +6272,10 @@

12019

@@ -7251,10 +6395,10 @@

11883

12020

if test "$xmlto" = "yes"; then

11884

12021

# Extract the first word of "xmlto", so it can be a program name with args.

11885

12022

set dummy xmlto; ac_word=$2

11894

12031

else

11895

12032

if test -n "$xmlto"; then

11896

12033

ac_cv_prog_xmlto="$xmlto" # Let the user override the test.

11897

@@ -7228,33 +6285,31 @@

12034

@@ -7264,33 +6408,31 @@

11898

12035

do

11899

12036

IFS=$as_save_IFS

11900

12037

test -z "$as_dir" && as_dir=.

11937

12074

USE_XMLTO_TRUE=

11938

12075

USE_XMLTO_FALSE='#'

11939

12076

else

11940

@@ -7268,15 +6323,15 @@

12077

@@ -7304,15 +6446,15 @@

11941

12078

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

11942

12079

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

11943

12080

ac_compiler_gnu=$ac_cv_c_compiler_gnu

11957

12094

else

11958

12095

# Double quotes because CPP needs to be expanded

11959

12096

for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"

11960

@@ -7290,103 +6345,43 @@

12097

@@ -7326,11 +6468,7 @@

11961

12098

# <limits.h> exists even on freestanding compilers.

11962

12099

# On the NeXT, cc -E runs the code through the compiler's parser,

11963

12100

# not just through cpp. "Syntax error" is here to catch this case.

11969

12106

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11970

12107

/* end confdefs.h. */

11971

12108

#ifdef __STDC__

11972

-# include <limits.h>

11973

-#else

11974

-# include <assert.h>

11975

-#endif

11976

- Syntax error

11977

-_ACEOF

12109

# include <limits.h>

12110

@@ -7339,90 +6477,34 @@

12111

#endif

12112

Syntax error

12113

_ACEOF

11978

12114

-if { (ac_try="$ac_cpp conftest.$ac_ext"

11979

12115

-case "(($ac_try" in

11980

12116

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12002

12138

-else

12003

12139

- echo "$as_me: failed program was:" >&5

12004

12140

-sed 's/^/| /' conftest.$ac_ext >&5

12005

+# include <limits.h>

12006

+#else

12007

+# include <assert.h>

12008

+#endif

12009

+ Syntax error

12010

+_ACEOF

12011

12141

+if ac_fn_c_try_cpp "$LINENO"; then :

12012

12142

12013

12143

+else

12073

12203

break

12074

12204

fi

12075

12205

12076

@@ -7398,8 +6393,8 @@

12206

@@ -7434,8 +6516,8 @@

12077

12207

else

12078

12208

ac_cv_prog_CPP=$CPP

12079

12209

fi

12084

12214

ac_preproc_ok=false

12085

12215

for ac_c_preproc_warn_flag in '' yes

12086

12216

do

12087

@@ -7409,11 +6404,7 @@

12217

@@ -7445,11 +6527,7 @@

12088

12218

# <limits.h> exists even on freestanding compilers.

12089

12219

# On the NeXT, cc -E runs the code through the compiler's parser,

12090

12220

# not just through cpp. "Syntax error" is here to catch this case.

12097

12227

/* end confdefs.h. */

12098

12228

#ifdef __STDC__

12099

12229

# include <limits.h>

12100

@@ -7422,97 +6413,40 @@

12230

@@ -7458,97 +6536,40 @@

12101

12231

#endif

12102

12232

Syntax error

12103

12233

_ACEOF

12205

12335

fi

12206

12336

12207

12337

ac_ext=c

12208

@@ -7522,45 +6456,40 @@

12338

@@ -7558,45 +6579,40 @@

12209

12339

ac_compiler_gnu=$ac_cv_c_compiler_gnu

12210

12340

12211

12341

12266

12396

if test $ac_count -gt ${ac_path_GREP_max-0}; then

12267

12397

# Best one so far, save it but keep looking for a better one

12268

12398

ac_cv_path_GREP="$ac_path_GREP"

12269

@@ -7572,77 +6501,61 @@

12399

@@ -7608,77 +6624,61 @@

12270

12400

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

12271

12401

esac

12272

12402

12367

12497

if test $ac_count -gt ${ac_path_EGREP_max-0}; then

12368

12498

# Best one so far, save it but keep looking for a better one

12369

12499

ac_cv_path_EGREP="$ac_path_EGREP"

12370

@@ -7654,46 +6567,31 @@

12500

@@ -7690,46 +6690,31 @@

12371

12501

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

12372

12502

esac

12373

12503

12427

12557

/* end confdefs.h. */

12428

12558

#include <stdlib.h>

12429

12559

#include <stdarg.h>

12430

@@ -7708,64 +6606,23 @@

12560

@@ -7744,64 +6729,23 @@

12431

12561

return 0;

12432

12562

}

12433

12563

_ACEOF

12497

12627

else

12498

12628

ac_cv_header_stdc=no

12499

12629

fi

12500

@@ -7775,18 +6632,14 @@

12630

@@ -7811,18 +6755,14 @@

12501

12631

12502

12632

if test $ac_cv_header_stdc = yes; then

12503

12633

# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

12519

12649

else

12520

12650

ac_cv_header_stdc=no

12521

12651

fi

12522

@@ -7796,14 +6649,10 @@

12652

@@ -7832,14 +6772,10 @@

12523

12653

12524

12654

if test $ac_cv_header_stdc = yes; then

12525

12655

# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

12536

12666

/* end confdefs.h. */

12537

12667

#include <ctype.h>

12538

12668

#include <stdlib.h>

12539

@@ -7830,55 +6679,29 @@

12669

@@ -7866,55 +6802,29 @@

12540

12670

return 0;

12541

12671

}

12542

12672

_ACEOF

12601

12731

withval=$with_curses; curseslib="$withval"

12602

12732

else

12603

12733

curseslib="auto"

12604

@@ -7887,10 +6710,10 @@

12605

if test "$curseslib" = "ncursesw"; then

12734

@@ -7926,10 +6836,10 @@

12735

if test "$curseslib" = "ncursesw" -o $ "$curseslib" = "auto" -a "$USE_NLS" = "yes" $; then

12606

12736

# Extract the first word of "ncursesw5-config", so it can be a program name with args.

12607

12737

set dummy ncursesw5-config; ac_word=$2

12608

12738

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

12616

12746

else

12617

12747

if test -n "$ncursesw5_config"; then

12618

12748

ac_cv_prog_ncursesw5_config="$ncursesw5_config" # Let the user override the test.

12619

@@ -7900,25 +6723,25 @@

12749

@@ -7939,25 +6849,25 @@

12620

12750

do

12621

12751

IFS=$as_save_IFS

12622

12752

test -z "$as_dir" && as_dir=.

12650

12780

fi

12651

12781

12652

12782

12653

@@ -7928,18 +6751,14 @@

12783

@@ -7968,18 +6878,14 @@

12654

12784

CURSES_CFLAGS=`ncursesw5-config --cflags`

12655

12785

curseslib="ncursesw"

12656

12786

else

12674

12804

/* end confdefs.h. */

12675

12805

12676

12806

/* Override any GCC internal prototype to avoid an error.

12677

@@ -7957,55 +6776,18 @@

12807

@@ -7997,55 +6903,18 @@

12678

12808

return 0;

12679

12809

}

12680

12810

_ACEOF

12736

12866

CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"

12737

12867

fi

12738

12868

12739

@@ -8014,10 +6796,10 @@

12869

@@ -8058,10 +6927,10 @@

12740

12870

if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then

12741

12871

# Extract the first word of "ncurses5-config", so it can be a program name with args.

12742

12872

set dummy ncurses5-config; ac_word=$2

12751

12881

else

12752

12882

if test -n "$ncurses5_config"; then

12753

12883

ac_cv_prog_ncurses5_config="$ncurses5_config" # Let the user override the test.

12754

@@ -8027,25 +6809,25 @@

12884

@@ -8071,25 +6940,25 @@

12755

12885

do

12756

12886

IFS=$as_save_IFS

12757

12887

test -z "$as_dir" && as_dir=.

12785

12915

fi

12786

12916

12787

12917

12788

@@ -8055,18 +6837,14 @@

12918

@@ -8100,18 +6969,14 @@

12789

12919

CURSES_CFLAGS=`ncurses5-config --cflags`

12790

12920

curseslib="ncurses"

12791

12921

else

12809

12939

/* end confdefs.h. */

12810

12940

12811

12941

/* Override any GCC internal prototype to avoid an error.

12812

@@ -8084,73 +6862,32 @@

12942

@@ -8129,73 +6994,32 @@

12813

12943

return 0;

12814

12944

}

12815

12945

_ACEOF

12894

13024

/* end confdefs.h. */

12895

13025

12896

13026

/* Override any GCC internal prototype to avoid an error.

12897

@@ -8168,63 +6905,24 @@

13027

@@ -8213,77 +7037,38 @@

12898

13028

return 0;

12899

13029

}

12900

13030

_ACEOF

12961

13091

- { { echo "$as_me:$LINENO: error: this packages requires a curses library" >&5

12962

13092

-echo "$as_me: error: this packages requires a curses library" >&2;}

12963

13093

- { (exit 1); exit 1; }; }

13094

- fi

13095

-

13096

- { echo "$as_me:$LINENO: checking for curses library" >&5

13097

-echo $ECHO_N "checking for curses library... $ECHO_C" >&6; }

13098

- { echo "$as_me:$LINENO: result: $curseslib" >&5

13099

-echo "${ECHO_T}$curseslib" >&6; }

13100

- { echo "$as_me:$LINENO: checking for curses header name" >&5

13101

-echo $ECHO_N "checking for curses header name... $ECHO_C" >&6; }

13102

- { echo "$as_me:$LINENO: result: $CURSESINC" >&5

13103

-echo "${ECHO_T}$CURSESINC" >&6; }

13104

- { echo "$as_me:$LINENO: checking for curses compiler flags" >&5

13105

-echo $ECHO_N "checking for curses compiler flags... $ECHO_C" >&6; }

13106

- { echo "$as_me:$LINENO: result: $CURSES_CFLAGS" >&5

13107

-echo "${ECHO_T}$CURSES_CFLAGS" >&6; }

12964

13108

+ as_fn_error "this packages requires a curses library" "$LINENO" 5

12965

fi

12966

fi

12967

12968

@@ -8256,7 +6954,7 @@

13109

+ fi

13110

+

13111

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curses library" >&5

13112

+$as_echo_n "checking for curses library... " >&6; }

13113

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $curseslib" >&5

13114

+$as_echo "$curseslib" >&6; }

13115

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curses header name" >&5

13116

+$as_echo_n "checking for curses header name... " >&6; }

13117

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURSESINC" >&5

13118

+$as_echo "$CURSESINC" >&6; }

13119

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curses compiler flags" >&5

13120

+$as_echo_n "checking for curses compiler flags... " >&6; }

13121

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURSES_CFLAGS" >&5

13122

+$as_echo "$CURSES_CFLAGS" >&6; }

13123

13124

if test -n "$CURSESLIBDIR"; then

13125

if test "-L$CURSESLIBDIR " = "$(echo $CURSESLIB | cut -c-$((${#CURSESLIBDIR}+3)) )"; then

13126

@@ -8300,82 +7085,33 @@

13127

fi

13128

LIBS="$CURSESLIB $LIBS"

13129

13130

- cat >conftest.$ac_ext <<_ACEOF

13131

-/* confdefs.h. */

13132

-_ACEOF

13133

-cat confdefs.h >>conftest.$ac_ext

13134

-cat >>conftest.$ac_ext <<_ACEOF

13135

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13136

/* end confdefs.h. */

13137

#include <panel.h>

13138

int

13139

main ()

13140

{

13141

set_escdelay(100);

13142

- ;

13143

- return 0;

13144

-}

13145

-_ACEOF

13146

-rm -f conftest.$ac_objext conftest$ac_exeext

13147

-if { (ac_try="$ac_link"

13148

-case "(($ac_try" in

13149

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13150

- *) ac_try_echo=$ac_try;;

13151

-esac

13152

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13153

- (eval "$ac_link") 2>conftest.er1

13154

- ac_status=$?

13155

- grep -v '^ *+' conftest.er1 >conftest.err

13156

- rm -f conftest.er1

13157

- cat conftest.err >&5

13158

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13159

- (exit $ac_status); } &&

13160

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13161

- { (case "(($ac_try" in

13162

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13163

- *) ac_try_echo=$ac_try;;

13164

-esac

13165

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13166

- (eval "$ac_try") 2>&5

13167

- ac_status=$?

13168

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13169

- (exit $ac_status); }; } &&

13170

- { ac_try='test -s conftest$ac_exeext'

13171

- { (case "(($ac_try" in

13172

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13173

- *) ac_try_echo=$ac_try;;

13174

-esac

13175

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13176

- (eval "$ac_try") 2>&5

13177

- ac_status=$?

13178

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13179

- (exit $ac_status); }; }; then

13180

+ ;

13181

+ return 0;

13182

+}

13183

+_ACEOF

13184

+if ac_fn_c_try_link "$LINENO"; then :

13185

HAVE_CURSES_ESCDELAY="yes"

13186

-else

13187

- echo "$as_me: failed program was:" >&5

13188

-sed 's/^/| /' conftest.$ac_ext >&5

13189

-

13190

-

13191

fi

13192

-

13193

rm -f core conftest.err conftest.$ac_objext \

13194

- conftest$ac_exeext conftest.$ac_ext

13195

+ conftest$ac_exeext conftest.$ac_ext

13196

if test "$HAVE_CURSES_ESCDELAY" = "yes"; then

13197

13198

-cat >>confdefs.h <<\_ACEOF

13199

-#define HAVE_CURSES_ESCDELAY 1

13200

-_ACEOF

13201

+$as_echo "#define HAVE_CURSES_ESCDELAY 1" >>confdefs.h

13202

13203

fi

13204

13205

if test "$USE_NLS" = "yes"; then

13206

- { echo "$as_me:$LINENO: checking for curses NLS support" >&5

13207

-echo $ECHO_N "checking for curses NLS support... $ECHO_C" >&6; }

13208

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curses NLS support" >&5

13209

+$as_echo_n "checking for curses NLS support... " >&6; }

13210

if test "$curseslib" = "curses"; then

13211

- cat >conftest.$ac_ext <<_ACEOF

13212

-/* confdefs.h. */

13213

-_ACEOF

13214

-cat confdefs.h >>conftest.$ac_ext

13215

-cat >>conftest.$ac_ext <<_ACEOF

13216

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13217

/* end confdefs.h. */

13218

13219

#define _XOPEN_SOURCE 1

13220

@@ -8393,141 +7129,32 @@

13221

return 0;

13222

}

13223

_ACEOF

13224

-rm -f conftest.$ac_objext conftest$ac_exeext

13225

-if { (ac_try="$ac_link"

13226

-case "(($ac_try" in

13227

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13228

- *) ac_try_echo=$ac_try;;

13229

-esac

13230

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13231

- (eval "$ac_link") 2>conftest.er1

13232

- ac_status=$?

13233

- grep -v '^ *+' conftest.er1 >conftest.err

13234

- rm -f conftest.er1

13235

- cat conftest.err >&5

13236

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13237

- (exit $ac_status); } &&

13238

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13239

- { (case "(($ac_try" in

13240

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13241

- *) ac_try_echo=$ac_try;;

13242

-esac

13243

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13244

- (eval "$ac_try") 2>&5

13245

- ac_status=$?

13246

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13247

- (exit $ac_status); }; } &&

13248

- { ac_try='test -s conftest$ac_exeext'

13249

- { (case "(($ac_try" in

13250

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13251

- *) ac_try_echo=$ac_try;;

13252

-esac

13253

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13254

- (eval "$ac_try") 2>&5

13255

- ac_status=$?

13256

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13257

- (exit $ac_status); }; }; then

13258

+if ac_fn_c_try_link "$LINENO"; then :

13259

CURSES_NLS="yes"

13260

-else

13261

- echo "$as_me: failed program was:" >&5

13262

-sed 's/^/| /' conftest.$ac_ext >&5

13263

-

13264

-

13265

fi

13266

-

13267

rm -f core conftest.err conftest.$ac_objext \

13268

- conftest$ac_exeext conftest.$ac_ext

13269

+ conftest$ac_exeext conftest.$ac_ext

13270

fi

13271

- { echo "$as_me:$LINENO: result: $CURSES_NLS" >&5

13272

-echo "${ECHO_T}$CURSES_NLS" >&6; }

13273

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURSES_NLS" >&5

13274

+$as_echo "$CURSES_NLS" >&6; }

13275

if test "$CURSES_NLS" = "yes"; then

13276

13277

-cat >>confdefs.h <<\_ACEOF

13278

-#define ENABLE_NLS_IN_CURSES 1

13279

-_ACEOF

13280

+$as_echo "#define ENABLE_NLS_IN_CURSES 1" >>confdefs.h

13281

13282

fi

13283

fi

13284

13285

# On IRIX 5.3, sys/types and inttypes.h are conflicting.

13286

-

13287

-

13288

-

13289

-

13290

-

13291

-

13292

-

13293

-

13294

-

13295

for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

13296

inttypes.h stdint.h unistd.h

13297

-do

13298

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

13299

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

13300

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

13301

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13302

- echo $ECHO_N "(cached) $ECHO_C" >&6

13303

-else

13304

- cat >conftest.$ac_ext <<_ACEOF

13305

-/* confdefs.h. */

13306

-_ACEOF

13307

-cat confdefs.h >>conftest.$ac_ext

13308

-cat >>conftest.$ac_ext <<_ACEOF

13309

-/* end confdefs.h. */

13310

-$ac_includes_default

13311

-

13312

-#include <$ac_header>

13313

-_ACEOF

13314

-rm -f conftest.$ac_objext

13315

-if { (ac_try="$ac_compile"

13316

-case "(($ac_try" in

13317

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13318

- *) ac_try_echo=$ac_try;;

13319

-esac

13320

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13321

- (eval "$ac_compile") 2>conftest.er1

13322

- ac_status=$?

13323

- grep -v '^ *+' conftest.er1 >conftest.err

13324

- rm -f conftest.er1

13325

- cat conftest.err >&5

13326

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13327

- (exit $ac_status); } &&

13328

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13329

- { (case "(($ac_try" in

13330

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13331

- *) ac_try_echo=$ac_try;;

13332

-esac

13333

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13334

- (eval "$ac_try") 2>&5

13335

- ac_status=$?

13336

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13337

- (exit $ac_status); }; } &&

13338

- { ac_try='test -s conftest.$ac_objext'

13339

- { (case "(($ac_try" in

13340

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13341

- *) ac_try_echo=$ac_try;;

13342

-esac

13343

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13344

- (eval "$ac_try") 2>&5

13345

- ac_status=$?

13346

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13347

- (exit $ac_status); }; }; then

13348

- eval "$as_ac_Header=yes"

13349

-else

13350

- echo "$as_me: failed program was:" >&5

13351

-sed 's/^/| /' conftest.$ac_ext >&5

13352

-

13353

- eval "$as_ac_Header=no"

13354

-fi

13355

-

13356

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13357

-fi

13358

-ac_res=`eval echo '${'$as_ac_Header'}'`

13359

- { echo "$as_me:$LINENO: result: $ac_res" >&5

13360

-echo "${ECHO_T}$ac_res" >&6; }

13361

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

13362

+do :

13363

+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

13364

+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

13365

+"

13366

+eval as_val=\$$as_ac_Header

13367

+ if test "x$as_val" = x""yes; then :

13368

cat >>confdefs.h <<_ACEOF

13369

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

13370

+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

13371

_ACEOF

13372

13373

fi

13374

@@ -8535,189 +7162,31 @@

13375

done

13376

13377

13378

-

13379

-

13380

-

13381

for ac_header in panel.h menu.h form.h

13382

-do

13383

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

13384

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13385

- { echo "$as_me:$LINENO: checking for $ac_header" >&5

13386

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

13387

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13388

- echo $ECHO_N "(cached) $ECHO_C" >&6

13389

-fi

13390

-ac_res=`eval echo '${'$as_ac_Header'}'`

13391

- { echo "$as_me:$LINENO: result: $ac_res" >&5

13392

-echo "${ECHO_T}$ac_res" >&6; }

13393

-else

13394

- # Is the header compilable?

13395

-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

13396

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

13397

-cat >conftest.$ac_ext <<_ACEOF

13398

-/* confdefs.h. */

13399

-_ACEOF

13400

-cat confdefs.h >>conftest.$ac_ext

13401

-cat >>conftest.$ac_ext <<_ACEOF

13402

-/* end confdefs.h. */

13403

-$ac_includes_default

13404

-#include <$ac_header>

13405

-_ACEOF

13406

-rm -f conftest.$ac_objext

13407

-if { (ac_try="$ac_compile"

13408

-case "(($ac_try" in

13409

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13410

- *) ac_try_echo=$ac_try;;

13411

-esac

13412

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13413

- (eval "$ac_compile") 2>conftest.er1

13414

- ac_status=$?

13415

- grep -v '^ *+' conftest.er1 >conftest.err

13416

- rm -f conftest.er1

13417

- cat conftest.err >&5

13418

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13419

- (exit $ac_status); } &&

13420

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13421

- { (case "(($ac_try" in

13422

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13423

- *) ac_try_echo=$ac_try;;

13424

-esac

13425

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13426

- (eval "$ac_try") 2>&5

13427

- ac_status=$?

13428

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13429

- (exit $ac_status); }; } &&

13430

- { ac_try='test -s conftest.$ac_objext'

13431

- { (case "(($ac_try" in

13432

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13433

- *) ac_try_echo=$ac_try;;

13434

-esac

13435

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13436

- (eval "$ac_try") 2>&5

13437

- ac_status=$?

13438

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13439

- (exit $ac_status); }; }; then

13440

- ac_header_compiler=yes

13441

-else

13442

- echo "$as_me: failed program was:" >&5

13443

-sed 's/^/| /' conftest.$ac_ext >&5

13444

-

13445

- ac_header_compiler=no

13446

-fi

13447

-

13448

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13449

-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

13450

-echo "${ECHO_T}$ac_header_compiler" >&6; }

13451

-

13452

-# Is the header present?

13453

-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

13454

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

13455

-cat >conftest.$ac_ext <<_ACEOF

13456

-/* confdefs.h. */

13457

-_ACEOF

13458

-cat confdefs.h >>conftest.$ac_ext

13459

-cat >>conftest.$ac_ext <<_ACEOF

13460

-/* end confdefs.h. */

13461

-#include <$ac_header>

13462

-_ACEOF

13463

-if { (ac_try="$ac_cpp conftest.$ac_ext"

13464

-case "(($ac_try" in

13465

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13466

- *) ac_try_echo=$ac_try;;

13467

-esac

13468

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13469

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

13470

- ac_status=$?

13471

- grep -v '^ *+' conftest.er1 >conftest.err

13472

- rm -f conftest.er1

13473

- cat conftest.err >&5

13474

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13475

- (exit $ac_status); } >/dev/null; then

13476

- if test -s conftest.err; then

13477

- ac_cpp_err=$ac_c_preproc_warn_flag

13478

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

13479

- else

13480

- ac_cpp_err=

13481

- fi

13482

-else

13483

- ac_cpp_err=yes

13484

-fi

13485

-if test -z "$ac_cpp_err"; then

13486

- ac_header_preproc=yes

13487

-else

13488

- echo "$as_me: failed program was:" >&5

13489

-sed 's/^/| /' conftest.$ac_ext >&5

13490

-

13491

- ac_header_preproc=no

13492

-fi

13493

-

13494

-rm -f conftest.err conftest.$ac_ext

13495

-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

13496

-echo "${ECHO_T}$ac_header_preproc" >&6; }

13497

-

13498

-# So? What about this header?

13499

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

13500

- yes:no: )

13501

- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

13502

-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

13503

- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

13504

-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

13505

- ac_header_preproc=yes

13506

- ;;

13507

- no:yes:* )

13508

- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

13509

-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

13510

- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

13511

-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

13512

- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

13513

-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

13514

- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

13515

-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

13516

- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

13517

-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

13518

- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

13519

-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

13520

-

13521

- ;;

13522

-esac

13523

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

13524

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

13525

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13526

- echo $ECHO_N "(cached) $ECHO_C" >&6

13527

-else

13528

- eval "$as_ac_Header=\$ac_header_preproc"

13529

-fi

13530

-ac_res=`eval echo '${'$as_ac_Header'}'`

13531

- { echo "$as_me:$LINENO: result: $ac_res" >&5

13532

-echo "${ECHO_T}$ac_res" >&6; }

13533

-

13534

-fi

13535

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

13536

+do :

13537

+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

13538

+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

13539

+eval as_val=\$$as_ac_Header

13540

+ if test "x$as_val" = x""yes; then :

13541

cat >>confdefs.h <<_ACEOF

13542

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

13543

+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

13544

_ACEOF

13545

13546

else

13547

- { { echo "$as_me:$LINENO: error: required curses helper header not found" >&5

13548

-echo "$as_me: error: required curses helper header not found" >&2;}

13549

- { (exit 1); exit 1; }; }

13550

+ as_fn_error "required curses helper header not found" "$LINENO" 5

13551

fi

13552

13553

done

13554

13555

- as_ac_Lib=`echo "ac_cv_lib_panel$NCURSESLIBSUFFIX''_new_panel" | $as_tr_sh`

13556

-{ echo "$as_me:$LINENO: checking for new_panel in -lpanel$NCURSESLIBSUFFIX" >&5

13557

-echo $ECHO_N "checking for new_panel in -lpanel$NCURSESLIBSUFFIX... $ECHO_C" >&6; }

13558

-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then

13559

- echo $ECHO_N "(cached) $ECHO_C" >&6

13560

+ as_ac_Lib=`$as_echo "ac_cv_lib_panel$NCURSESLIBSUFFIX''_new_panel" | $as_tr_sh`

13561

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_panel in -lpanel$NCURSESLIBSUFFIX" >&5

13562

+$as_echo_n "checking for new_panel in -lpanel$NCURSESLIBSUFFIX... " >&6; }

13563

+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :

13564

+ $as_echo_n "(cached) " >&6

13565

else

13566

ac_check_lib_save_LIBS=$LIBS

13567

LIBS="-lpanel$NCURSESLIBSUFFIX $LIBS"

13568

-cat >conftest.$ac_ext <<_ACEOF

13569

-/* confdefs.h. */

13570

-_ACEOF

13571

-cat confdefs.h >>conftest.$ac_ext

13572

-cat >>conftest.$ac_ext <<_ACEOF

13573

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13574

/* end confdefs.h. */

13575

13576

/* Override any GCC internal prototype to avoid an error.

13577

@@ -8735,76 +7204,34 @@

13578

return 0;

13579

}

13580

_ACEOF

13581

-rm -f conftest.$ac_objext conftest$ac_exeext

13582

-if { (ac_try="$ac_link"

13583

-case "(($ac_try" in

13584

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13585

- *) ac_try_echo=$ac_try;;

13586

-esac

13587

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13588

- (eval "$ac_link") 2>conftest.er1

13589

- ac_status=$?

13590

- grep -v '^ *+' conftest.er1 >conftest.err

13591

- rm -f conftest.er1

13592

- cat conftest.err >&5

13593

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13594

- (exit $ac_status); } &&

13595

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13596

- { (case "(($ac_try" in

13597

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13598

- *) ac_try_echo=$ac_try;;

13599

-esac

13600

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13601

- (eval "$ac_try") 2>&5

13602

- ac_status=$?

13603

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13604

- (exit $ac_status); }; } &&

13605

- { ac_try='test -s conftest$ac_exeext'

13606

- { (case "(($ac_try" in

13607

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13608

- *) ac_try_echo=$ac_try;;

13609

-esac

13610

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13611

- (eval "$ac_try") 2>&5

13612

- ac_status=$?

13613

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13614

- (exit $ac_status); }; }; then

13615

+if ac_fn_c_try_link "$LINENO"; then :

13616

eval "$as_ac_Lib=yes"

13617

else

13618

- echo "$as_me: failed program was:" >&5

13619

-sed 's/^/| /' conftest.$ac_ext >&5

13620

-

13621

- eval "$as_ac_Lib=no"

13622

+ eval "$as_ac_Lib=no"

13623

fi

13624

-

13625

rm -f core conftest.err conftest.$ac_objext \

13626

- conftest$ac_exeext conftest.$ac_ext

13627

+ conftest$ac_exeext conftest.$ac_ext

13628

LIBS=$ac_check_lib_save_LIBS

13629

fi

13630

-ac_res=`eval echo '${'$as_ac_Lib'}'`

13631

- { echo "$as_me:$LINENO: result: $ac_res" >&5

13632

-echo "${ECHO_T}$ac_res" >&6; }

13633

-if test `eval echo '${'$as_ac_Lib'}'` = yes; then

13634

+eval ac_res=\$$as_ac_Lib

13635

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

13636

+$as_echo "$ac_res" >&6; }

13637

+eval as_val=\$$as_ac_Lib

13638

+ if test "x$as_val" = x""yes; then :

13639

CURSESLIB="-lpanel$NCURSESLIBSUFFIX $CURSESLIB"

13640

else

13641

- { { echo "$as_me:$LINENO: error: panel$NCURSESLIBSUFFIX library not found" >&5

13642

-echo "$as_me: error: panel$NCURSESLIBSUFFIX library not found" >&2;}

13643

- { (exit 1); exit 1; }; }

13644

+ as_fn_error "panel$NCURSESLIBSUFFIX library not found" "$LINENO" 5

13645

fi

13646

13647

- as_ac_Lib=`echo "ac_cv_lib_menu$NCURSESLIBSUFFIX''_new_menu" | $as_tr_sh`

13648

-{ echo "$as_me:$LINENO: checking for new_menu in -lmenu$NCURSESLIBSUFFIX" >&5

13649

-echo $ECHO_N "checking for new_menu in -lmenu$NCURSESLIBSUFFIX... $ECHO_C" >&6; }

13650

-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then

13651

- echo $ECHO_N "(cached) $ECHO_C" >&6

13652

+ as_ac_Lib=`$as_echo "ac_cv_lib_menu$NCURSESLIBSUFFIX''_new_menu" | $as_tr_sh`

13653

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_menu in -lmenu$NCURSESLIBSUFFIX" >&5

13654

+$as_echo_n "checking for new_menu in -lmenu$NCURSESLIBSUFFIX... " >&6; }

13655

+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :

13656

+ $as_echo_n "(cached) " >&6

13657

else

13658

ac_check_lib_save_LIBS=$LIBS

13659

LIBS="-lmenu$NCURSESLIBSUFFIX $LIBS"

13660

-cat >conftest.$ac_ext <<_ACEOF

13661

-/* confdefs.h. */

13662

-_ACEOF

13663

-cat confdefs.h >>conftest.$ac_ext

13664

-cat >>conftest.$ac_ext <<_ACEOF

13665

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13666

/* end confdefs.h. */

13667

13668

/* Override any GCC internal prototype to avoid an error.

13669

@@ -8822,76 +7249,34 @@

13670

return 0;

13671

}

13672

_ACEOF

13673

-rm -f conftest.$ac_objext conftest$ac_exeext

13674

-if { (ac_try="$ac_link"

13675

-case "(($ac_try" in

13676

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13677

- *) ac_try_echo=$ac_try;;

13678

-esac

13679

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13680

- (eval "$ac_link") 2>conftest.er1

13681

- ac_status=$?

13682

- grep -v '^ *+' conftest.er1 >conftest.err

13683

- rm -f conftest.er1

13684

- cat conftest.err >&5

13685

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13686

- (exit $ac_status); } &&

13687

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13688

- { (case "(($ac_try" in

13689

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13690

- *) ac_try_echo=$ac_try;;

13691

-esac

13692

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13693

- (eval "$ac_try") 2>&5

13694

- ac_status=$?

13695

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13696

- (exit $ac_status); }; } &&

13697

- { ac_try='test -s conftest$ac_exeext'

13698

- { (case "(($ac_try" in

13699

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13700

- *) ac_try_echo=$ac_try;;

13701

-esac

13702

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13703

- (eval "$ac_try") 2>&5

13704

- ac_status=$?

13705

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13706

- (exit $ac_status); }; }; then

13707

+if ac_fn_c_try_link "$LINENO"; then :

13708

eval "$as_ac_Lib=yes"

13709

else

13710

- echo "$as_me: failed program was:" >&5

13711

-sed 's/^/| /' conftest.$ac_ext >&5

13712

-

13713

- eval "$as_ac_Lib=no"

13714

+ eval "$as_ac_Lib=no"

13715

fi

13716

-

13717

rm -f core conftest.err conftest.$ac_objext \

13718

- conftest$ac_exeext conftest.$ac_ext

13719

+ conftest$ac_exeext conftest.$ac_ext

13720

LIBS=$ac_check_lib_save_LIBS

13721

fi

13722

-ac_res=`eval echo '${'$as_ac_Lib'}'`

13723

- { echo "$as_me:$LINENO: result: $ac_res" >&5

13724

-echo "${ECHO_T}$ac_res" >&6; }

13725

-if test `eval echo '${'$as_ac_Lib'}'` = yes; then

13726

+eval ac_res=\$$as_ac_Lib

13727

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

13728

+$as_echo "$ac_res" >&6; }

13729

+eval as_val=\$$as_ac_Lib

13730

+ if test "x$as_val" = x""yes; then :

13731

CURSESLIB="-lmenu$NCURSESLIBSUFFIX $CURSESLIB"

13732

else

13733

- { { echo "$as_me:$LINENO: error: menu$NCURSESLIBSUFFIX library not found" >&5

13734

-echo "$as_me: error: menu$NCURSESLIBSUFFIX library not found" >&2;}

13735

- { (exit 1); exit 1; }; }

13736

+ as_fn_error "menu$NCURSESLIBSUFFIX library not found" "$LINENO" 5

13737

fi

13738

13739

- as_ac_Lib=`echo "ac_cv_lib_form$NCURSESLIBSUFFIX''_new_form" | $as_tr_sh`

13740

-{ echo "$as_me:$LINENO: checking for new_form in -lform$NCURSESLIBSUFFIX" >&5

13741

-echo $ECHO_N "checking for new_form in -lform$NCURSESLIBSUFFIX... $ECHO_C" >&6; }

13742

-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then

13743

- echo $ECHO_N "(cached) $ECHO_C" >&6

13744

+ as_ac_Lib=`$as_echo "ac_cv_lib_form$NCURSESLIBSUFFIX''_new_form" | $as_tr_sh`

13745

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_form in -lform$NCURSESLIBSUFFIX" >&5

13746

+$as_echo_n "checking for new_form in -lform$NCURSESLIBSUFFIX... " >&6; }

13747

+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :

13748

+ $as_echo_n "(cached) " >&6

13749

else

13750

ac_check_lib_save_LIBS=$LIBS

13751

LIBS="-lform$NCURSESLIBSUFFIX $LIBS"

13752

-cat >conftest.$ac_ext <<_ACEOF

13753

-/* confdefs.h. */

13754

-_ACEOF

13755

-cat confdefs.h >>conftest.$ac_ext

13756

-cat >>conftest.$ac_ext <<_ACEOF

13757

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13758

/* end confdefs.h. */

13759

13760

/* Override any GCC internal prototype to avoid an error.

13761

@@ -8909,61 +7294,23 @@

13762

return 0;

13763

}

13764

_ACEOF

13765

-rm -f conftest.$ac_objext conftest$ac_exeext

13766

-if { (ac_try="$ac_link"

13767

-case "(($ac_try" in

13768

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13769

- *) ac_try_echo=$ac_try;;

13770

-esac

13771

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13772

- (eval "$ac_link") 2>conftest.er1

13773

- ac_status=$?

13774

- grep -v '^ *+' conftest.er1 >conftest.err

13775

- rm -f conftest.er1

13776

- cat conftest.err >&5

13777

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13778

- (exit $ac_status); } &&

13779

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13780

- { (case "(($ac_try" in

13781

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13782

- *) ac_try_echo=$ac_try;;

13783

-esac

13784

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13785

- (eval "$ac_try") 2>&5

13786

- ac_status=$?

13787

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13788

- (exit $ac_status); }; } &&

13789

- { ac_try='test -s conftest$ac_exeext'

13790

- { (case "(($ac_try" in

13791

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13792

- *) ac_try_echo=$ac_try;;

13793

-esac

13794

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13795

- (eval "$ac_try") 2>&5

13796

- ac_status=$?

13797

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13798

- (exit $ac_status); }; }; then

13799

+if ac_fn_c_try_link "$LINENO"; then :

13800

eval "$as_ac_Lib=yes"

13801

else

13802

- echo "$as_me: failed program was:" >&5

13803

-sed 's/^/| /' conftest.$ac_ext >&5

13804

-

13805

- eval "$as_ac_Lib=no"

13806

+ eval "$as_ac_Lib=no"

13807

fi

13808

-

13809

rm -f core conftest.err conftest.$ac_objext \

13810

- conftest$ac_exeext conftest.$ac_ext

13811

+ conftest$ac_exeext conftest.$ac_ext

13812

LIBS=$ac_check_lib_save_LIBS

13813

fi

13814

-ac_res=`eval echo '${'$as_ac_Lib'}'`

13815

- { echo "$as_me:$LINENO: result: $ac_res" >&5

13816

-echo "${ECHO_T}$ac_res" >&6; }

13817

-if test `eval echo '${'$as_ac_Lib'}'` = yes; then

13818

+eval ac_res=\$$as_ac_Lib

13819

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

13820

+$as_echo "$ac_res" >&6; }

13821

+eval as_val=\$$as_ac_Lib

13822

+ if test "x$as_val" = x""yes; then :

13823

CURSESLIB="-lform$NCURSESLIBSUFFIX $CURSESLIB"

13824

else

13825

- { { echo "$as_me:$LINENO: error: form$NCURSESLIBSUFFIX library not found" >&5

13826

-echo "$as_me: error: form$NCURSESLIBSUFFIX library not found" >&2;}

13827

- { (exit 1); exit 1; }; }

13828

+ as_fn_error "form$NCURSESLIBSUFFIX library not found" "$LINENO" 5

13829

fi

13830

13831

13832

@@ -8975,10 +7322,10 @@

13833

CURSESLIB="-L$CURSESLIBDIR $CURSESLIB"

13834

fi

13835

13836

- { echo "$as_me:$LINENO: checking for curses linker flags" >&5

13837

-echo $ECHO_N "checking for curses linker flags... $ECHO_C" >&6; }

13838

- { echo "$as_me:$LINENO: result: $CURSESLIB" >&5

13839

-echo "${ECHO_T}$CURSESLIB" >&6; }

13840

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curses linker flags" >&5

13841

+$as_echo_n "checking for curses linker flags... " >&6; }

13842

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURSESLIB" >&5

13843

+$as_echo "$CURSESLIB" >&6; }

13844

fi

13845

13846

13847

@@ -9009,7 +7356,7 @@

12969

13848

12970

13849

12971

13850

# Check whether --with-testsound was given.

12974

13853

withval=$with_testsound; TESTSOUND="$withval"

12975

13854

else

12976

13855

TESTSOUND="$dir/test.wav"

12977

@@ -8267,16 +6965,12 @@

13856

@@ -9020,16 +7367,12 @@

12978

13857

ac_config_headers="$ac_config_headers include/aconfig.h"

12979

13858

12980

13859

12996

13875

/* end confdefs.h. */

12997

13876

12998

13877

int

12999

@@ -8286,10 +6980,10 @@

13878

@@ -9039,10 +7382,10 @@

13000

13879

#ifndef __cplusplus

13001

13880

/* Ultrix mips cc rejects this. */

13002

13881

typedef int charset[2];

13010

13889

/* NEC SVR4.0.2 mips cc rejects this. */

13011

13890

struct point {int x, y;};

13012

13891

static struct point const zero = {0,0};

13013

@@ -8298,11 +6992,11 @@

13892

@@ -9051,11 +7394,11 @@

13014

13893

an arm of an if-expression whose if-part is not a constant

13015

13894

expression */

13016

13895

const char *g = "string";

13026

13905

{ /* SCO 3.2v4 cc rejects this. */

13027

13906

char *t;

13028

13907

char const *s = 0 ? (char *) 0 : (char const *) 0;

13029

@@ -8329,79 +7023,36 @@

13908

@@ -9082,79 +7425,36 @@

13030

13909

const int foo = 10;

13031

13910

if (!foo) return 0;

13032

13911

}

13117

13996

/* end confdefs.h. */

13118

13997

#ifndef __cplusplus

13119

13998

typedef int foo_t;

13120

@@ -8410,56 +7061,16 @@

13999

@@ -9163,56 +7463,16 @@

13121

14000

#endif

13122

14001

13123

14002

_ACEOF

13177

14056

13178

14057

case $ac_cv_c_inline in

13179

14058

inline | yes) ;;

13180

@@ -8476,16 +7087,12 @@

14059

@@ -9229,16 +7489,12 @@

13181

14060

;;

13182

14061

esac

13183

14062

13199

14078

/* end confdefs.h. */

13200

14079

#include <sys/types.h>

13201

14080

#include <sys/time.h>

13202

@@ -8495,84 +7102,41 @@

14081

@@ -9248,84 +7504,41 @@

13203

14082

main ()

13204

14083

{

13205

14084

if ((struct tm *) 0)

13300

14179

ac_cv_prog_gcc_traditional=yes

13301

14180

else

13302

14181

ac_cv_prog_gcc_traditional=no

13303

@@ -8581,25 +7145,21 @@

14182

@@ -9334,25 +7547,21 @@

13304

14183

13305

14184

13306

14185

if test $ac_cv_prog_gcc_traditional = no; then

13330

14209

if test $ac_cv_prog_gcc_traditional = yes; then

13331

14210

CC="$CC -traditional"

13332

14211

fi

13333

@@ -8607,16 +7167,16 @@

14212

@@ -9360,16 +7569,16 @@

13334

14213

13335

14214

13336

14215

# Check whether --enable-largefile was given.

13352

14231

else

13353

14232

ac_cv_sys_largefile_CC=no

13354

14233

if test "$GCC" != yes; then

13355

@@ -8624,11 +7184,7 @@

14234

@@ -9377,11 +7586,7 @@

13356

14235

while :; do

13357

14236

# IRIX 6.2 and later do not support large files by default,

13358

14237

# so use the C compiler's -n32 option if that helps.

13365

14244

/* end confdefs.h. */

13366

14245

#include <sys/types.h>

13367

14246

/* Check that off_t can represent 2**63 - 1 correctly.

13368

@@ -8647,92 +7203,14 @@

14247

@@ -9400,92 +7605,14 @@

13369

14248

return 0;

13370

14249

}

13371

14250

_ACEOF

13460

14339

rm -f core conftest.err conftest.$ac_objext

13461

14340

break

13462

14341

done

13463

@@ -8740,24 +7218,19 @@

14342

@@ -9493,24 +7620,19 @@

13464

14343

rm -f conftest.$ac_ext

13465

14344

fi

13466

14345

fi

13492

14371

/* end confdefs.h. */

13493

14372

#include <sys/types.h>

13494

14373

/* Check that off_t can represent 2**63 - 1 correctly.

13495

@@ -8776,54 +7249,11 @@

14374

@@ -9529,54 +7651,11 @@

13496

14375

return 0;

13497

14376

}

13498

14377

_ACEOF

13550

14429

/* end confdefs.h. */

13551

14430

#define _FILE_OFFSET_BITS 64

13552

14431

#include <sys/types.h>

13553

@@ -8843,74 +7273,33 @@

14432

@@ -9596,74 +7675,33 @@

13554

14433

return 0;

13555

14434

}

13556

14435

_ACEOF

13641

14520

/* end confdefs.h. */

13642

14521

#include <sys/types.h>

13643

14522

/* Check that off_t can represent 2**63 - 1 correctly.

13644

@@ -8929,54 +7318,11 @@

14523

@@ -9682,54 +7720,11 @@

13645

14524

return 0;

13646

14525

}

13647

14526

_ACEOF

13699

14578

/* end confdefs.h. */

13700

14579

#define _LARGE_FILES 1

13701

14580

#include <sys/types.h>

13702

@@ -8996,62 +7342,26 @@

14581

@@ -9749,62 +7744,26 @@

13703

14582

return 0;

13704

14583

}

13705

14584

_ACEOF

13773

14652

fi

13774

14653

13775

14654

13776

@@ -9074,7 +7384,7 @@

14655

@@ -9827,7 +7786,7 @@

13777

14656

13778

14657

13779

14658

13782

14661

13783

14662

cat >confcache <<\_ACEOF

13784

14663

# This file is a shell script that caches the results of configure

13785

@@ -9103,12 +7413,13 @@

14664

@@ -9856,12 +7815,13 @@

13786

14665

case $ac_val in #(

13787

14666

*${as_nl}*)

13788

14667

case $ac_var in #(

13799

14678

esac ;;

13800

14679

esac

13801

14680

done

13802

@@ -9116,8 +7427,8 @@

14681

@@ -9869,8 +7829,8 @@

13803

14682

(set) 2>&1 |

13804

14683

case $as_nl`(ac_space=' '; set) 2>&1` in #(

13805

14684

*${as_nl}ac_space=\ *)

13810

14689

sed -n \

13811

14690

"s/'/'\\\\''/g;

13812

14691

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

13813

@@ -9140,12 +7451,12 @@

14692

@@ -9893,12 +7853,12 @@

13814

14693

if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

13815

14694

if test -w "$cache_file"; then

13816

14695

test "x$cache_file" != "x/dev/null" &&

13827

14706

fi

13828

14707

fi

13829

14708

rm -f confcache

13830

@@ -9161,94 +7472,70 @@

14709

@@ -9914,94 +7874,70 @@

13831

14710

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

13832

14711

# 1. Remove the extension, and $U if already installed.

13833

14712

ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

13956

14835

#! $SHELL

13957

14836

# Generated by $as_me.

13958

14837

# Run this file to recreate the current configuration.

13959

@@ -9258,55 +7545,79 @@

14838

@@ -10011,55 +7947,79 @@

13960

14839

debug=false

13961

14840

ac_cs_recheck=false

13962

14841

ac_cs_silent=false

14070

14949

fi

14071

14950

14072

14951

14073

@@ -9315,20 +7626,18 @@

14952

@@ -10068,20 +8028,18 @@

14074

14953

# there to prevent editors from complaining about space-tab.

14075

14954

# (If _AS_PATH_WALK were called with IFS unset, it would disable word

14076

14955

# splitting by setting IFS to empty value.)

14094

14973

IFS=$as_save_IFS

14095

14974

14096

14975

;;

14097

@@ -9339,113 +7648,123 @@

14976

@@ -10092,113 +8050,123 @@

14098

14977

as_myself=$0

14099

14978

fi

14100

14979

if test ! -f "$as_myself"; then

14311

15190

14312

15191

if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

14313

15192

as_dirname=dirname

14314

@@ -9453,68 +7772,149 @@

15193

@@ -10206,68 +8174,149 @@

14315

15194

as_dirname=false

14316

15195

fi

14317

15196

14494

15373

14495

15374

# Sed expression to map a string onto a valid CPP name.

14496

15375

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

14497

@@ -9524,13 +7924,19 @@

15376

@@ -10277,13 +8326,19 @@

14498

15377

14499

15378

14500

15379

exec 6>&1

14516

15395

14517

15396

CONFIG_FILES = $CONFIG_FILES

14518

15397

CONFIG_HEADERS = $CONFIG_HEADERS

14519

@@ -9543,7 +7949,16 @@

15398

@@ -10296,7 +8351,16 @@

14520

15399

14521

15400

_ACEOF

14522

15401

14534

15413

# Files that config.status was made for.

14535

15414

config_files="$ac_config_files"

14536

15415

config_headers="$ac_config_headers"

14537

@@ -9551,22 +7966,24 @@

15416

@@ -10304,22 +8368,24 @@

14538

15417

14539

15418

_ACEOF

14540

15419

14569

15448

14570

15449

Configuration files:

14571

15450

$config_files

14572

@@ -9577,27 +7994,29 @@

15451

@@ -10330,27 +8396,29 @@

14573

15452

Configuration commands:

14574

15453

$config_commands

14575

15454

14607

15486

ac_need_defaults=:

14608

15487

while test $# != 0

14609

15488

do

14610

@@ -9619,34 +8038,38 @@

15489

@@ -10372,34 +8440,38 @@

14611

15490

14612

15491

ac_cs_recheck=: ;;

14613

15492

--version | --versio | --versi | --vers | --ver | --ve | --v | -V )

14657

15536

ac_need_defaults=false ;;

14658

15537

14659

15538

esac

14660

@@ -9661,27 +8084,29 @@

15539

@@ -10414,27 +8486,29 @@

14661

15540

fi

14662

15541

14663

15542

_ACEOF

14694

15573

#

14695

15574

# INIT-COMMANDS

14696

15575

#

14697

@@ -9696,7 +8121,7 @@

15576

@@ -10449,7 +8523,7 @@

14698

15577

14699

15578

_ACEOF

14700

15579

14703

15582

14704

15583

# Handling of arguments.

14705

15584

for ac_config_target in $ac_config_targets

14706

@@ -9713,9 +8138,6 @@

15585

@@ -10466,9 +8540,6 @@

14707

15586

"amixer/Makefile") CONFIG_FILES="$CONFIG_FILES amixer/Makefile" ;;

14708

15587

"m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;

14709

15588

"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;

14713

15592

"aplay/Makefile") CONFIG_FILES="$CONFIG_FILES aplay/Makefile" ;;

14714

15593

"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;

14715

15594

"iecset/Makefile") CONFIG_FILES="$CONFIG_FILES iecset/Makefile" ;;

14716

@@ -9729,9 +8151,7 @@

15595

@@ -10482,9 +8553,7 @@

14717

15596

"speaker-test/Makefile") CONFIG_FILES="$CONFIG_FILES speaker-test/Makefile" ;;

14718

15597

"speaker-test/samples/Makefile") CONFIG_FILES="$CONFIG_FILES speaker-test/samples/Makefile" ;;

14719

15598

14724

15603

esac

14725

15604

done

14726

15605

14727

@@ -9758,7 +8178,7 @@

15606

@@ -10511,7 +8580,7 @@

14728

15607

trap 'exit_status=$?

14729

15608

{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

14730

15609

' 0

14733

15612

}

14734

15613

# Create a (secure) tmp directory for tmp files.

14735

15614

14736

@@ -9769,238 +8189,139 @@

15615

@@ -10522,238 +8591,139 @@

14737

15616

{

14738

15617

tmp=./conf$$-$RANDOM

14739

15618

(umask 077 && mkdir "$tmp")

15084

15963

15085

15964

# VPATH may cause trouble with some makes, so we remove $(srcdir),

15086

15965

# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

15087

@@ -10017,20 +8338,128 @@

15966

@@ -10770,20 +8740,128 @@

15088

15967

}'

15089

15968

fi

15090

15969

15218

16097

:[FH]-) ac_tag=-:-;;

15219

16098

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

15220

16099

esac

15221

@@ -10058,26 +8487,34 @@

16100

@@ -10811,26 +8889,34 @@

15222

16101

[\\/$]*) false;;

15223

16102

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

15224

16103

esac ||

15262

16141

esac

15263

16142

;;

15264

16143

esac

15265

@@ -10087,42 +8524,7 @@

16144

@@ -10840,42 +8926,7 @@

15266

16145

X"$ac_file" : 'X$//$[^/]' \| \

15267

16146

X"$ac_file" : 'X$//$$' \| \

15268

16147

X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

15306

16185

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15307

16186

s//\1/

15308

16187

q

15309

@@ -10140,20 +8542,15 @@

16188

@@ -10893,20 +8944,15 @@

15310

16189

q

15311

16190

}

15312

16191

s/.*/./; q'`

15330

16209

case $ac_top_builddir_sub in

15331

16210

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

15332

16211

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

15333

@@ -10191,14 +8588,19 @@

16212

@@ -10944,14 +8990,19 @@

15334

16213

[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;

15335

16214

*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;

15336

16215

esac

15353

16232

p

15354

16233

q

15355

16234

}

15356

@@ -10206,36 +8608,37 @@

16235

@@ -10959,36 +9010,37 @@

15357

16236

/@docdir@/p

15358

16237

/@infodir@/p

15359

16238

/@localedir@/p

15401

16280

s&@srcdir@&$ac_srcdir&;t t

15402

16281

s&@abs_srcdir@&$ac_abs_srcdir&;t t

15403

16282

s&@top_srcdir@&$ac_top_srcdir&;t t

15404

@@ -10244,136 +8647,67 @@

16283

@@ -10997,136 +9049,67 @@

15405

16284

s&@abs_builddir@&$ac_abs_builddir&;t t

15406

16285

s&@abs_top_builddir@&$ac_abs_top_builddir&;t t

15407

16286

s&@INSTALL@&$ac_INSTALL&;t t

15571

16450

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15572

16451

s//\1/

15573

16452

q

15574

@@ -10393,8 +8727,8 @@

16453

@@ -11146,8 +9129,8 @@

15575

16454

s/.*/./; q'`/stamp-h$_am_stamp_count

15576

16455

;;

15577

16456

15582

16461

;;

15583

16462

esac

15584

16463

15585

@@ -10513,22 +8847,33 @@

16464

@@ -11266,22 +9249,33 @@

15586

16465

;;

15587

16466

esac

15588

16467

done ;;

15628

16507

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15629

16508

s//\1/

15630

16509

q

15631

@@ -10546,68 +8891,33 @@

16510

@@ -11299,68 +9293,33 @@

15632

16511

q

15633

16512

}

15634

16513

s/.*/./; q'`

15720

16599

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15721

16600

s//\1/

15722

16601

q

15723

@@ -10625,27 +8935,25 @@

16602

@@ -11378,27 +9337,25 @@

15724

16603

q

15725

16604

}

15726

16605

s/.*/./; q'`

15756

16635

15757

16636

# configure is writing to config.log, and then calls config.status.

15758

16637

# config.status does its own redirection, appending to config.log.

15759

@@ -10665,6 +8973,10 @@

16638

@@ -11418,6 +9375,10 @@

15760

16639

exec 5>>config.log

15761

16640

# Use ||, not &&, to avoid exiting from the if with $? = 1, which

15762

16641

# would make configure fail if this is the last instruction.

15768

16647

+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

15769

16648

fi

15770

16649

15771

diff -urN alsa-utils-1.0.20/configure.in alsa-utils-1.0.20.new/configure.in

15772

--- alsa-utils-1.0.20/configure.in 2009-08-21 09:44:10.000000000 +1000

15773

+++ alsa-utils-1.0.20.new/configure.in 2009-08-21 09:45:09.000000000 +1000

16650

diff -urN alsa-utils-1.0.21/configure.in alsa-utils-1.0.21.new/configure.in

16651

--- alsa-utils-1.0.21/configure.in 2009-09-01 01:14:20.000000000 +1000

16652

+++ alsa-utils-1.0.21.new/configure.in 2009-11-05 16:02:08.000000000 +1100

15774

16653

@@ -77,16 +77,6 @@

15775

16654

fi

15776

16655

AM_CONDITIONAL(ALSAMIXER, test x$alsamixer = xtrue)

15788

16667

xmlto=""

15789

16668

if test x"$alsaconf" = xtrue; then

15790

16669

AC_ARG_ENABLE(xmlto,

15791

@@ -182,8 +172,6 @@

16670

@@ -268,8 +258,6 @@

15792

16671

AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \

15793

16672

alsamixer/Makefile amidi/Makefile amixer/Makefile \

15794

16673

m4/Makefile po/Makefile.in \

15797

16676

aplay/Makefile include/Makefile iecset/Makefile utils/Makefile \

15798

16677

utils/alsa-utils.spec seq/Makefile seq/aconnect/Makefile \

15799

16678

seq/aplaymidi/Makefile seq/aseqdump/Makefile seq/aseqnet/Makefile \

15800

diff -urN alsa-utils-1.0.20/iecset/Makefile.in alsa-utils-1.0.20.new/iecset/Makefile.in

15801

--- alsa-utils-1.0.20/iecset/Makefile.in 2009-08-21 09:44:11.000000000 +1000

15802

+++ alsa-utils-1.0.20.new/iecset/Makefile.in 2009-08-21 09:45:09.000000000 +1000

16679

diff -urN alsa-utils-1.0.21/iecset/Makefile.in alsa-utils-1.0.21.new/iecset/Makefile.in

16680

--- alsa-utils-1.0.21/iecset/Makefile.in 2009-09-01 01:14:24.000000000 +1000

16681

+++ alsa-utils-1.0.21.new/iecset/Makefile.in 2009-11-05 16:02:23.000000000 +1100

15803

16682

@@ -1,8 +1,9 @@

15804

16683

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

15805

16684

+# Makefile.in generated by automake 1.11 from Makefile.am.

16364

17243

16365

17244

# Tell versions [3.59,3.63) of GNU make to not export all variables.

16366

17245

# Otherwise a system limit (for SysV at least) may be exceeded.

16367

diff -urN alsa-utils-1.0.20/include/aconfig.h.in alsa-utils-1.0.20.new/include/aconfig.h.in

16368

--- alsa-utils-1.0.20/include/aconfig.h.in 2009-08-21 09:44:11.000000000 +1000

16369

+++ alsa-utils-1.0.20.new/include/aconfig.h.in 2009-08-21 09:45:09.000000000 +1000

16370

@@ -61,6 +61,9 @@

17246

diff -urN alsa-utils-1.0.21/include/aconfig.h.in alsa-utils-1.0.21.new/include/aconfig.h.in

17247

--- alsa-utils-1.0.21/include/aconfig.h.in 2009-09-01 01:14:22.000000000 +1000

17248

+++ alsa-utils-1.0.21.new/include/aconfig.h.in 2009-11-05 16:02:26.000000000 +1100

17249

@@ -103,6 +103,9 @@

16371

17250

/* Define to the one symbol short name of this package. */

16372

17251

#undef PACKAGE_TARNAME

16373

17252

16377

17256

/* Define to the version of this package. */

16378

17257

#undef PACKAGE_VERSION

16379

17258

16380

diff -urN alsa-utils-1.0.20/include/Makefile.in alsa-utils-1.0.20.new/include/Makefile.in

16381

--- alsa-utils-1.0.20/include/Makefile.in 2009-08-21 09:44:11.000000000 +1000

16382

+++ alsa-utils-1.0.20.new/include/Makefile.in 2009-08-21 09:45:09.000000000 +1000

17259

diff -urN alsa-utils-1.0.21/include/Makefile.in alsa-utils-1.0.21.new/include/Makefile.in

17260

--- alsa-utils-1.0.21/include/Makefile.in 2009-09-01 01:14:24.000000000 +1000

17261

+++ alsa-utils-1.0.21.new/include/Makefile.in 2009-11-05 16:02:23.000000000 +1100

16383

17262

@@ -1,8 +1,9 @@

16384

17263

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

16385

17264

+# Makefile.in generated by automake 1.11 from Makefile.am.

16503

17382

+top_builddir = @top_builddir@

16504

17383

+top_srcdir = @top_srcdir@

16505

17384

xmlto = @xmlto@

16506

noinst_HEADERS = version.h gettext.h

17385

noinst_HEADERS = version.h gettext.h gettext_curses.h

16507

17386

INCLUDES = -I$(top_srcdir)/include

16508

17387

@@ -197,14 +190,14 @@

16509

17388

@for dep in $?; do \

16748

17627

# Tell versions [3.59,3.63) of GNU make to not export all variables.

16749

17628

# Otherwise a system limit (for SysV at least) may be exceeded.

16750

17629

.NOEXPORT:

16751

diff -urN alsa-utils-1.0.20/m4/Makefile.in alsa-utils-1.0.20.new/m4/Makefile.in

16752

--- alsa-utils-1.0.20/m4/Makefile.in 2009-08-21 09:44:11.000000000 +1000

16753

+++ alsa-utils-1.0.20.new/m4/Makefile.in 2009-08-21 09:45:09.000000000 +1000

17630

diff -urN alsa-utils-1.0.21/m4/Makefile.in alsa-utils-1.0.21.new/m4/Makefile.in

17631

--- alsa-utils-1.0.21/m4/Makefile.in 2009-09-01 01:14:24.000000000 +1000

17632

+++ alsa-utils-1.0.21.new/m4/Makefile.in 2009-11-05 16:02:23.000000000 +1100

16754

17633

@@ -1,8 +1,9 @@

16755

17634

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

16756

17635

+# Makefile.in generated by automake 1.11 from Makefile.am.

17026

17905

17027

17906

# Tell versions [3.59,3.63) of GNU make to not export all variables.

17028

17907

# Otherwise a system limit (for SysV at least) may be exceeded.

17029

diff -urN alsa-utils-1.0.20/Makefile.am alsa-utils-1.0.20.new/Makefile.am

17030

--- alsa-utils-1.0.20/Makefile.am 2009-08-21 09:44:11.000000000 +1000

17031

+++ alsa-utils-1.0.20.new/Makefile.am 2009-08-21 09:45:09.000000000 +1000

17908

diff -urN alsa-utils-1.0.21/Makefile.am alsa-utils-1.0.21.new/Makefile.am

17909

--- alsa-utils-1.0.21/Makefile.am 2009-09-01 01:14:20.000000000 +1000

17910

+++ alsa-utils-1.0.21.new/Makefile.am 2009-11-05 16:18:18.000000000 +1100

17032

17911

@@ -10,9 +10,6 @@

17033

17912

if HAVE_RAWMIDI

17034

17913

SUBDIRS += amidi

17039

17918

if HAVE_PCM

17040

17919

SUBDIRS += aplay iecset speaker-test

17041

17920

endif

17042

diff -urN alsa-utils-1.0.20/Makefile.in alsa-utils-1.0.20.new/Makefile.in

17043

--- alsa-utils-1.0.20/Makefile.in 2009-08-21 09:44:11.000000000 +1000

17044

+++ alsa-utils-1.0.20.new/Makefile.in 2009-08-21 09:45:09.000000000 +1000

17921

diff -urN alsa-utils-1.0.21/Makefile.in alsa-utils-1.0.21.new/Makefile.in

17922

--- alsa-utils-1.0.21/Makefile.in 2009-09-01 01:14:25.000000000 +1000

17923

+++ alsa-utils-1.0.21.new/Makefile.in 2009-11-05 16:18:25.000000000 +1100

17045

17924

@@ -1,8 +1,9 @@

17046

17925

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

17047

17926

+# Makefile.in generated by automake 1.11 from Makefile.am.

17663

18542

# Tell versions [3.59,3.63) of GNU make to not export all variables.

17664

18543

# Otherwise a system limit (for SysV at least) may be exceeded.

17665

18544

.NOEXPORT:

17666

diff -urN alsa-utils-1.0.20/seq/aconnect/Makefile.in alsa-utils-1.0.20.new/seq/aconnect/Makefile.in

17667

--- alsa-utils-1.0.20/seq/aconnect/Makefile.in 2009-08-21 09:44:11.000000000 +1000

17668

+++ alsa-utils-1.0.20.new/seq/aconnect/Makefile.in 2009-08-21 09:45:09.000000000 +1000

18545

diff -urN alsa-utils-1.0.21/seq/aconnect/Makefile.in alsa-utils-1.0.21.new/seq/aconnect/Makefile.in

18546

--- alsa-utils-1.0.21/seq/aconnect/Makefile.in 2009-09-01 01:14:24.000000000 +1000

18547

+++ alsa-utils-1.0.21.new/seq/aconnect/Makefile.in 2009-11-05 16:02:24.000000000 +1100

17669

18548

@@ -1,8 +1,9 @@

17670

18549

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

17671

18550

+# Makefile.in generated by automake 1.11 from Makefile.am.

18231

19110

18232

19111

# Tell versions [3.59,3.63) of GNU make to not export all variables.

18233

19112

# Otherwise a system limit (for SysV at least) may be exceeded.

18234

diff -urN alsa-utils-1.0.20/seq/aplaymidi/Makefile.in alsa-utils-1.0.20.new/seq/aplaymidi/Makefile.in

18235

--- alsa-utils-1.0.20/seq/aplaymidi/Makefile.in 2009-08-21 09:44:11.000000000 +1000

18236

+++ alsa-utils-1.0.20.new/seq/aplaymidi/Makefile.in 2009-08-21 09:45:09.000000000 +1000

19113

diff -urN alsa-utils-1.0.21/seq/aplaymidi/Makefile.in alsa-utils-1.0.21.new/seq/aplaymidi/Makefile.in

19114

--- alsa-utils-1.0.21/seq/aplaymidi/Makefile.in 2009-09-01 01:14:24.000000000 +1000

19115

+++ alsa-utils-1.0.21.new/seq/aplaymidi/Makefile.in 2009-11-05 16:02:24.000000000 +1100

18237

19116

@@ -1,8 +1,9 @@

18238

19117

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

18239

19118

+# Makefile.in generated by automake 1.11 from Makefile.am.

18804

19683

18805

19684

# Tell versions [3.59,3.63) of GNU make to not export all variables.

18806

19685

# Otherwise a system limit (for SysV at least) may be exceeded.

18807

diff -urN alsa-utils-1.0.20/seq/aseqdump/Makefile.in alsa-utils-1.0.20.new/seq/aseqdump/Makefile.in

18808

--- alsa-utils-1.0.20/seq/aseqdump/Makefile.in 2009-08-21 09:44:11.000000000 +1000

18809

+++ alsa-utils-1.0.20.new/seq/aseqdump/Makefile.in 2009-08-21 09:45:09.000000000 +1000

19686

diff -urN alsa-utils-1.0.21/seq/aseqdump/Makefile.in alsa-utils-1.0.21.new/seq/aseqdump/Makefile.in

19687

--- alsa-utils-1.0.21/seq/aseqdump/Makefile.in 2009-09-01 01:14:24.000000000 +1000

19688

+++ alsa-utils-1.0.21.new/seq/aseqdump/Makefile.in 2009-11-05 16:02:24.000000000 +1100

18810

19689

@@ -1,8 +1,9 @@

18811

19690

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

18812

19691

+# Makefile.in generated by automake 1.11 from Makefile.am.

19370

20249

19371

20250

# Tell versions [3.59,3.63) of GNU make to not export all variables.

19372

20251

# Otherwise a system limit (for SysV at least) may be exceeded.

19373

diff -urN alsa-utils-1.0.20/seq/aseqnet/Makefile.in alsa-utils-1.0.20.new/seq/aseqnet/Makefile.in

19374

--- alsa-utils-1.0.20/seq/aseqnet/Makefile.in 2009-08-21 09:44:11.000000000 +1000

19375

+++ alsa-utils-1.0.20.new/seq/aseqnet/Makefile.in 2009-08-21 09:45:09.000000000 +1000

20252

diff -urN alsa-utils-1.0.21/seq/aseqnet/Makefile.in alsa-utils-1.0.21.new/seq/aseqnet/Makefile.in

20253

--- alsa-utils-1.0.21/seq/aseqnet/Makefile.in 2009-09-01 01:14:24.000000000 +1000

20254

+++ alsa-utils-1.0.21.new/seq/aseqnet/Makefile.in 2009-11-05 16:02:24.000000000 +1100

19376

20255

@@ -1,8 +1,9 @@

19377

20256

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

19378

20257

+# Makefile.in generated by automake 1.11 from Makefile.am.

19937

20816

19938

20817

# Tell versions [3.59,3.63) of GNU make to not export all variables.

19939

20818

# Otherwise a system limit (for SysV at least) may be exceeded.

19940

diff -urN alsa-utils-1.0.20/seq/Makefile.in alsa-utils-1.0.20.new/seq/Makefile.in

19941

--- alsa-utils-1.0.20/seq/Makefile.in 2009-08-21 09:44:11.000000000 +1000

19942

+++ alsa-utils-1.0.20.new/seq/Makefile.in 2009-08-21 09:45:09.000000000 +1000

20819

diff -urN alsa-utils-1.0.21/seq/Makefile.in alsa-utils-1.0.21.new/seq/Makefile.in

20820

--- alsa-utils-1.0.21/seq/Makefile.in 2009-09-01 01:14:24.000000000 +1000

20821

+++ alsa-utils-1.0.21.new/seq/Makefile.in 2009-11-05 16:02:24.000000000 +1100

19943

20822

@@ -1,8 +1,9 @@

19944

20823

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

19945

20824

+# Makefile.in generated by automake 1.11 from Makefile.am.

20414

21293

20415

21294

# Tell versions [3.59,3.63) of GNU make to not export all variables.

20416

21295

# Otherwise a system limit (for SysV at least) may be exceeded.

20417

diff -urN alsa-utils-1.0.20/speaker-test/Makefile.in alsa-utils-1.0.20.new/speaker-test/Makefile.in

20418

--- alsa-utils-1.0.20/speaker-test/Makefile.in 2009-08-21 09:44:11.000000000 +1000

20419

+++ alsa-utils-1.0.20.new/speaker-test/Makefile.in 2009-08-21 09:45:09.000000000 +1000

21296

diff -urN alsa-utils-1.0.21/speaker-test/Makefile.in alsa-utils-1.0.21.new/speaker-test/Makefile.in

21297

--- alsa-utils-1.0.21/speaker-test/Makefile.in 2009-09-01 01:14:25.000000000 +1000

21298

+++ alsa-utils-1.0.21.new/speaker-test/Makefile.in 2009-11-05 16:02:24.000000000 +1100

20420

21299

@@ -1,8 +1,9 @@

20421

21300

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

20422

21301

+# Makefile.in generated by automake 1.11 from Makefile.am.

21123

22002

# Tell versions [3.59,3.63) of GNU make to not export all variables.

21124

22003

# Otherwise a system limit (for SysV at least) may be exceeded.

21125

22004

.NOEXPORT:

21126

diff -urN alsa-utils-1.0.20/speaker-test/samples/Makefile.in alsa-utils-1.0.20.new/speaker-test/samples/Makefile.in

21127

--- alsa-utils-1.0.20/speaker-test/samples/Makefile.in 2009-08-21 09:44:11.000000000 +1000

21128

+++ alsa-utils-1.0.20.new/speaker-test/samples/Makefile.in 2009-08-21 09:45:09.000000000 +1000

22005

diff -urN alsa-utils-1.0.21/speaker-test/samples/Makefile.in alsa-utils-1.0.21.new/speaker-test/samples/Makefile.in

22006

--- alsa-utils-1.0.21/speaker-test/samples/Makefile.in 2009-09-01 01:14:25.000000000 +1000

22007

+++ alsa-utils-1.0.21.new/speaker-test/samples/Makefile.in 2009-11-05 16:02:24.000000000 +1100

21129

22008

@@ -1,8 +1,9 @@

21130

22009

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

21131

22010

+# Makefile.in generated by automake 1.11 from Makefile.am.

21497

22376

21498

22377

# Tell versions [3.59,3.63) of GNU make to not export all variables.

21499

22378

# Otherwise a system limit (for SysV at least) may be exceeded.

21500

diff -urN alsa-utils-1.0.20/utils/Makefile.in alsa-utils-1.0.20.new/utils/Makefile.in

21501

--- alsa-utils-1.0.20/utils/Makefile.in 2009-08-21 09:44:11.000000000 +1000

21502

+++ alsa-utils-1.0.20.new/utils/Makefile.in 2009-08-21 09:45:09.000000000 +1000

22379

diff -urN alsa-utils-1.0.21/utils/Makefile.in alsa-utils-1.0.21.new/utils/Makefile.in

22380

--- alsa-utils-1.0.21/utils/Makefile.in 2009-09-01 01:14:25.000000000 +1000

22381

+++ alsa-utils-1.0.21.new/utils/Makefile.in 2009-11-05 16:02:24.000000000 +1100

21503

22382

@@ -1,8 +1,9 @@

21504

22383

-# Makefile.in generated by automake 1.9.6 from Makefile.am.

21505

22384

+# Makefile.in generated by automake 1.11 from Makefile.am.