~ubuntu-branches/ubuntu/hardy/gnome-applets/hardy-updates : revision 62

1

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/accessx-status/docs/Makefile.in gnome-applets-2.21.2.new/accessx-status/docs/Makefile.in

2

--- gnome-applets-2.21.2/accessx-status/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

3

+++ gnome-applets-2.21.2.new/accessx-status/docs/Makefile.in 2007-12-03 10:33:58.000000000 +0100

1

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/accessx-status/docs/Makefile.in gnome-applets-2.21.4.new/accessx-status/docs/Makefile.in

2

--- gnome-applets-2.21.4/accessx-status/docs/Makefile.in 2008-01-14 20:49:37.000000000 +0100

3

+++ gnome-applets-2.21.4.new/accessx-status/docs/Makefile.in 2008-01-15 15:34:41.000000000 +0100

4

@@ -62,7 +62,6 @@

5

$(top_srcdir)/m4/acinclude.m4 \

6

$(top_srcdir)/m4/gnome-doc-utils.m4 \

9

$(top_srcdir)/configure.in

10

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

11

$(ACLOCAL_M4)

12

@@ -206,6 +205,7 @@

12

@@ -209,6 +208,7 @@

13

MIXER_LIBS = @MIXER_LIBS@

14

MKDIR_P = @MKDIR_P@

15

MKINSTALLDIRS = @MKINSTALLDIRS@

17

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

18

MSGFMT = @MSGFMT@

19

MSGFMT_OPTS = @MSGFMT_OPTS@

20

@@ -237,11 +237,10 @@

20

@@ -240,11 +240,10 @@

21

RANLIB = @RANLIB@

22

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

23

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

30

SYSCONFDIR = @SYSCONFDIR@

31

USE_NLS = @USE_NLS@

32

VERSION = @VERSION@

33

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/accessx-status/Makefile.in gnome-applets-2.21.2.new/accessx-status/Makefile.in

34

--- gnome-applets-2.21.2/accessx-status/Makefile.in 2007-12-03 10:32:24.000000000 +0100

35

+++ gnome-applets-2.21.2.new/accessx-status/Makefile.in 2007-12-03 10:33:58.000000000 +0100

33

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/accessx-status/Makefile.in gnome-applets-2.21.4.new/accessx-status/Makefile.in

34

--- gnome-applets-2.21.4/accessx-status/Makefile.in 2008-01-14 20:49:37.000000000 +0100

35

+++ gnome-applets-2.21.4.new/accessx-status/Makefile.in 2008-01-15 15:34:41.000000000 +0100

36

@@ -41,7 +41,6 @@

37

$(top_srcdir)/m4/acinclude.m4 \

38

$(top_srcdir)/m4/gnome-doc-utils.m4 \

41

$(top_srcdir)/configure.in

42

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

43

$(ACLOCAL_M4)

44

@@ -227,6 +226,7 @@

44

@@ -230,6 +229,7 @@

45

MIXER_LIBS = @MIXER_LIBS@

46

MKDIR_P = @MKDIR_P@

47

MKINSTALLDIRS = @MKINSTALLDIRS@

49

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

50

MSGFMT = @MSGFMT@

51

MSGFMT_OPTS = @MSGFMT_OPTS@

52

@@ -258,11 +258,10 @@

52

@@ -261,11 +261,10 @@

53

RANLIB = @RANLIB@

54

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

55

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

62

SYSCONFDIR = @SYSCONFDIR@

63

USE_NLS = @USE_NLS@

64

VERSION = @VERSION@

65

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/accessx-status/pixmaps/Makefile.in gnome-applets-2.21.2.new/accessx-status/pixmaps/Makefile.in

66

--- gnome-applets-2.21.2/accessx-status/pixmaps/Makefile.in 2007-12-03 10:32:24.000000000 +0100

67

+++ gnome-applets-2.21.2.new/accessx-status/pixmaps/Makefile.in 2007-12-03 10:33:58.000000000 +0100

65

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/accessx-status/pixmaps/Makefile.in gnome-applets-2.21.4.new/accessx-status/pixmaps/Makefile.in

66

--- gnome-applets-2.21.4/accessx-status/pixmaps/Makefile.in 2008-01-14 20:49:37.000000000 +0100

67

+++ gnome-applets-2.21.4.new/accessx-status/pixmaps/Makefile.in 2008-01-15 15:34:42.000000000 +0100

68

@@ -38,7 +38,6 @@

69

$(top_srcdir)/m4/acinclude.m4 \

70

$(top_srcdir)/m4/gnome-doc-utils.m4 \

73

$(top_srcdir)/configure.in

74

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

75

$(ACLOCAL_M4)

76

@@ -193,6 +192,7 @@

76

@@ -196,6 +195,7 @@

77

MIXER_LIBS = @MIXER_LIBS@

78

MKDIR_P = @MKDIR_P@

79

MKINSTALLDIRS = @MKINSTALLDIRS@

81

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

82

MSGFMT = @MSGFMT@

83

MSGFMT_OPTS = @MSGFMT_OPTS@

84

@@ -224,11 +224,10 @@

84

@@ -227,11 +227,10 @@

85

RANLIB = @RANLIB@

86

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

87

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

94

SYSCONFDIR = @SYSCONFDIR@

95

USE_NLS = @USE_NLS@

96

VERSION = @VERSION@

97

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/aclocal.m4 gnome-applets-2.21.2.new/aclocal.m4

98

--- gnome-applets-2.21.2/aclocal.m4 2007-12-03 10:32:24.000000000 +0100

99

+++ gnome-applets-2.21.2.new/aclocal.m4 2007-12-03 10:33:58.000000000 +0100

97

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/aclocal.m4 gnome-applets-2.21.4.new/aclocal.m4

98

--- gnome-applets-2.21.4/aclocal.m4 2008-01-14 20:49:31.000000000 +0100

99

+++ gnome-applets-2.21.4.new/aclocal.m4 2008-01-15 15:34:39.000000000 +0100

100

@@ -11,4474 +11,4672 @@

101

# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

102

# PARTICULAR PURPOSE.

1194

-# This file is free software; the Free Software Foundation

1195

-# gives unlimited permission to copy and/or distribute it,

1196

-# with or without modifications, as long as this notice is preserved.

1197

+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL

1197

+# serial 51 Debian 1.5.24-2ubuntu1 AC_PROG_LIBTOOL

1198

1199

-# serial 4

1200

15854

m4_include([m4/intltool.m4])

15855

m4_include([m4/python.m4])

15856

-m4_include([m4/system-tools-backends.m4])

15857

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/battstat/apmlib/Makefile.in gnome-applets-2.21.2.new/battstat/apmlib/Makefile.in

15858

--- gnome-applets-2.21.2/battstat/apmlib/Makefile.in 2007-12-03 10:32:24.000000000 +0100

15859

+++ gnome-applets-2.21.2.new/battstat/apmlib/Makefile.in 2007-12-03 10:33:58.000000000 +0100

15857

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/battstat/apmlib/Makefile.in gnome-applets-2.21.4.new/battstat/apmlib/Makefile.in

15858

--- gnome-applets-2.21.4/battstat/apmlib/Makefile.in 2008-01-14 20:49:37.000000000 +0100

15859

+++ gnome-applets-2.21.4.new/battstat/apmlib/Makefile.in 2008-01-15 15:34:42.000000000 +0100

15860

@@ -44,7 +44,6 @@

15861

$(top_srcdir)/m4/acinclude.m4 \

15862

$(top_srcdir)/m4/gnome-doc-utils.m4 \

15865

$(top_srcdir)/configure.in

15866

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

15867

$(ACLOCAL_M4)

15868

@@ -208,6 +207,7 @@

15868

@@ -211,6 +210,7 @@

15869

MIXER_LIBS = @MIXER_LIBS@

15870

MKDIR_P = @MKDIR_P@

15871

MKINSTALLDIRS = @MKINSTALLDIRS@

15873

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

15874

MSGFMT = @MSGFMT@

15875

MSGFMT_OPTS = @MSGFMT_OPTS@

15876

@@ -239,11 +239,10 @@

15876

@@ -242,11 +242,10 @@

15877

RANLIB = @RANLIB@

15878

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

15879

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

15886

SYSCONFDIR = @SYSCONFDIR@

15887

USE_NLS = @USE_NLS@

15888

VERSION = @VERSION@

15889

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/battstat/docs/Makefile.in gnome-applets-2.21.2.new/battstat/docs/Makefile.in

15890

--- gnome-applets-2.21.2/battstat/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

15891

+++ gnome-applets-2.21.2.new/battstat/docs/Makefile.in 2007-12-03 10:33:58.000000000 +0100

15889

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/battstat/docs/Makefile.in gnome-applets-2.21.4.new/battstat/docs/Makefile.in

15890

--- gnome-applets-2.21.4/battstat/docs/Makefile.in 2008-01-14 20:49:37.000000000 +0100

15891

+++ gnome-applets-2.21.4.new/battstat/docs/Makefile.in 2008-01-15 15:34:42.000000000 +0100

15892

@@ -62,7 +62,6 @@

15893

$(top_srcdir)/m4/acinclude.m4 \

15894

$(top_srcdir)/m4/gnome-doc-utils.m4 \

15897

$(top_srcdir)/configure.in

15898

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

15899

$(ACLOCAL_M4)

15900

@@ -206,6 +205,7 @@

15900

@@ -209,6 +208,7 @@

15901

MIXER_LIBS = @MIXER_LIBS@

15902

MKDIR_P = @MKDIR_P@

15903

MKINSTALLDIRS = @MKINSTALLDIRS@

15905

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

15906

MSGFMT = @MSGFMT@

15907

MSGFMT_OPTS = @MSGFMT_OPTS@

15908

@@ -237,11 +237,10 @@

15908

@@ -240,11 +240,10 @@

15909

RANLIB = @RANLIB@

15910

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

15911

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

15918

SYSCONFDIR = @SYSCONFDIR@

15919

USE_NLS = @USE_NLS@

15920

VERSION = @VERSION@

15921

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/battstat/Makefile.in gnome-applets-2.21.2.new/battstat/Makefile.in

15922

--- gnome-applets-2.21.2/battstat/Makefile.in 2007-12-03 10:32:24.000000000 +0100

15923

+++ gnome-applets-2.21.2.new/battstat/Makefile.in 2007-12-03 10:33:58.000000000 +0100

15921

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/battstat/Makefile.in gnome-applets-2.21.4.new/battstat/Makefile.in

15922

--- gnome-applets-2.21.4/battstat/Makefile.in 2008-01-14 20:49:37.000000000 +0100

15923

+++ gnome-applets-2.21.4.new/battstat/Makefile.in 2008-01-15 15:34:42.000000000 +0100

15924

@@ -40,7 +40,6 @@

15925

$(top_srcdir)/m4/acinclude.m4 \

15926

$(top_srcdir)/m4/gnome-doc-utils.m4 \

15929

$(top_srcdir)/configure.in

15930

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

15931

$(ACLOCAL_M4)

15932

@@ -234,6 +233,7 @@

15932

@@ -237,6 +236,7 @@

15933

MIXER_LIBS = @MIXER_LIBS@

15934

MKDIR_P = @MKDIR_P@

15935

MKINSTALLDIRS = @MKINSTALLDIRS@

15937

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

15938

MSGFMT = @MSGFMT@

15939

MSGFMT_OPTS = @MSGFMT_OPTS@

15940

@@ -265,11 +265,10 @@

15940

@@ -268,11 +268,10 @@

15941

RANLIB = @RANLIB@

15942

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

15943

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

15950

SYSCONFDIR = @SYSCONFDIR@

15951

USE_NLS = @USE_NLS@

15952

VERSION = @VERSION@

15953

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/battstat/sounds/Makefile.in gnome-applets-2.21.2.new/battstat/sounds/Makefile.in

15954

--- gnome-applets-2.21.2/battstat/sounds/Makefile.in 2007-12-03 10:32:24.000000000 +0100

15955

+++ gnome-applets-2.21.2.new/battstat/sounds/Makefile.in 2007-12-03 10:33:58.000000000 +0100

15953

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/battstat/sounds/Makefile.in gnome-applets-2.21.4.new/battstat/sounds/Makefile.in

15954

--- gnome-applets-2.21.4/battstat/sounds/Makefile.in 2008-01-14 20:49:37.000000000 +0100

15955

+++ gnome-applets-2.21.4.new/battstat/sounds/Makefile.in 2008-01-15 15:34:42.000000000 +0100

15956

@@ -38,7 +38,6 @@

15957

$(top_srcdir)/m4/acinclude.m4 \

15958

$(top_srcdir)/m4/gnome-doc-utils.m4 \

15961

$(top_srcdir)/configure.in

15962

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

15963

$(ACLOCAL_M4)

15964

@@ -191,6 +190,7 @@

15964

@@ -194,6 +193,7 @@

15965

MIXER_LIBS = @MIXER_LIBS@

15966

MKDIR_P = @MKDIR_P@

15967

MKINSTALLDIRS = @MKINSTALLDIRS@

15969

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

15970

MSGFMT = @MSGFMT@

15971

MSGFMT_OPTS = @MSGFMT_OPTS@

15972

@@ -222,11 +222,10 @@

15972

@@ -225,11 +225,10 @@

15973

RANLIB = @RANLIB@

15974

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

15975

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

15982

SYSCONFDIR = @SYSCONFDIR@

15983

USE_NLS = @USE_NLS@

15984

VERSION = @VERSION@

15985

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/charpick/help/Makefile.in gnome-applets-2.21.2.new/charpick/help/Makefile.in

15986

--- gnome-applets-2.21.2/charpick/help/Makefile.in 2007-12-03 10:32:24.000000000 +0100

15987

+++ gnome-applets-2.21.2.new/charpick/help/Makefile.in 2007-12-03 10:33:58.000000000 +0100

15985

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/charpick/help/Makefile.in gnome-applets-2.21.4.new/charpick/help/Makefile.in

15986

--- gnome-applets-2.21.4/charpick/help/Makefile.in 2008-01-14 20:49:38.000000000 +0100

15987

+++ gnome-applets-2.21.4.new/charpick/help/Makefile.in 2008-01-15 15:34:42.000000000 +0100

15988

@@ -62,7 +62,6 @@

15989

$(top_srcdir)/m4/acinclude.m4 \

15990

$(top_srcdir)/m4/gnome-doc-utils.m4 \

15993

$(top_srcdir)/configure.in

15994

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

15995

$(ACLOCAL_M4)

15996

@@ -206,6 +205,7 @@

15996

@@ -209,6 +208,7 @@

15997

MIXER_LIBS = @MIXER_LIBS@

15998

MKDIR_P = @MKDIR_P@

15999

MKINSTALLDIRS = @MKINSTALLDIRS@

16001

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

16002

MSGFMT = @MSGFMT@

16003

MSGFMT_OPTS = @MSGFMT_OPTS@

16004

@@ -237,11 +237,10 @@

16004

@@ -240,11 +240,10 @@

16005

RANLIB = @RANLIB@

16006

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

16007

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

16014

SYSCONFDIR = @SYSCONFDIR@

16015

USE_NLS = @USE_NLS@

16016

VERSION = @VERSION@

16017

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/charpick/Makefile.in gnome-applets-2.21.2.new/charpick/Makefile.in

16018

--- gnome-applets-2.21.2/charpick/Makefile.in 2007-12-03 10:32:24.000000000 +0100

16019

+++ gnome-applets-2.21.2.new/charpick/Makefile.in 2007-12-03 10:33:58.000000000 +0100

16017

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/charpick/Makefile.in gnome-applets-2.21.4.new/charpick/Makefile.in

16018

--- gnome-applets-2.21.4/charpick/Makefile.in 2008-01-14 20:49:38.000000000 +0100

16019

+++ gnome-applets-2.21.4.new/charpick/Makefile.in 2008-01-15 15:34:42.000000000 +0100

16020

@@ -40,7 +40,6 @@

16021

$(top_srcdir)/m4/acinclude.m4 \

16022

$(top_srcdir)/m4/gnome-doc-utils.m4 \

16025

$(top_srcdir)/configure.in

16026

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

16027

$(ACLOCAL_M4)

16028

@@ -230,6 +229,7 @@

16028

@@ -233,6 +232,7 @@

16029

MIXER_LIBS = @MIXER_LIBS@

16030

MKDIR_P = @MKDIR_P@

16031

MKINSTALLDIRS = @MKINSTALLDIRS@

16033

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

16034

MSGFMT = @MSGFMT@

16035

MSGFMT_OPTS = @MSGFMT_OPTS@

16036

@@ -261,11 +261,10 @@

16036

@@ -264,11 +264,10 @@

16037

RANLIB = @RANLIB@

16038

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

16039

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

16046

SYSCONFDIR = @SYSCONFDIR@

16047

USE_NLS = @USE_NLS@

16048

VERSION = @VERSION@

16049

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/config.h.in gnome-applets-2.21.2.new/config.h.in

16050

--- gnome-applets-2.21.2/config.h.in 2007-12-03 10:32:24.000000000 +0100

16051

+++ gnome-applets-2.21.2.new/config.h.in 2007-12-03 10:33:58.000000000 +0100

16049

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/config.h.in gnome-applets-2.21.4.new/config.h.in

16050

--- gnome-applets-2.21.4/config.h.in 2008-01-14 20:49:36.000000000 +0100

16051

+++ gnome-applets-2.21.4.new/config.h.in 2008-01-15 15:34:25.000000000 +0100

16052

@@ -135,15 +135,9 @@

16053

/* install prefix */

16054

#undef PREFIX

16065

/* sysconfdir */

16066

#undef SYSCONFDIR

16067

16068

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/configure gnome-applets-2.21.2.new/configure

16069

--- gnome-applets-2.21.2/configure 2007-12-03 10:32:24.000000000 +0100

16070

+++ gnome-applets-2.21.2.new/configure 2007-12-03 10:33:58.000000000 +0100

16068

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/configure gnome-applets-2.21.4.new/configure

16069

--- gnome-applets-2.21.4/configure 2008-01-14 20:49:35.000000000 +0100

16070

+++ gnome-applets-2.21.4.new/configure 2008-01-15 15:34:41.000000000 +0100

16071

@@ -1,6 +1,6 @@

16072

#! /bin/sh

16073

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

16074

-# Generated by GNU Autoconf 2.60 for gnome-applets 2.21.2.

16075

+# Generated by GNU Autoconf 2.61 for gnome-applets 2.21.2.

16074

-# Generated by GNU Autoconf 2.60 for gnome-applets 2.21.4.

16075

+# Generated by GNU Autoconf 2.61 for gnome-applets 2.21.4.

16076

#

16077

16078

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

16255

LN_S

16256

ECHO

16257

AR

16258

@@ -1007,8 +1023,7 @@

16258

@@ -1010,8 +1026,7 @@

16259

HAVE_XKB

16260

APPLET_ACCESSX_TRUE

16261

APPLET_ACCESSX_FALSE

16265

MODEMLIGHTS_LIBS

16266

APPLET_MODEMLIGHTS_TRUE

16267

APPLET_MODEMLIGHTS_FALSE

16268

@@ -1046,6 +1061,7 @@

16268

@@ -1049,6 +1064,7 @@

16269

CC

16270

CFLAGS

16271

LDFLAGS

16273

CPPFLAGS

16274

PKG_CONFIG

16275

CPP

16276

@@ -1095,7 +1111,9 @@

16277

XML2_CFLAGS

16278

XML2_LIBS

16276

@@ -1100,7 +1116,9 @@

16277

LIBGWEATHER_CFLAGS

16278

LIBGWEATHER_LIBS

16279

MIXER_CFLAGS

16280

-MIXER_LIBS'

16281

+MIXER_LIBS

16284

16285

16286

# Initialize some variables set by options.

16287

@@ -1201,10 +1219,10 @@

16287

@@ -1206,10 +1224,10 @@

16288

-disable-* | --disable-*)

16289

ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'`

16290

# Reject names that are not valid shell variable names.

16297

eval enable_$ac_feature=no ;;

16298

16299

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

16300

@@ -1220,10 +1238,10 @@

16300

@@ -1225,10 +1243,10 @@

16301

-enable-* | --enable-*)

16302

ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

16303

# Reject names that are not valid shell variable names.

16310

eval enable_$ac_feature=\$ac_optarg ;;

16311

16312

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

16313

@@ -1417,19 +1435,19 @@

16313

@@ -1422,19 +1440,19 @@

16314

-with-* | --with-*)

16315

ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

16316

# Reject names that are not valid shell variable names.

16334

eval with_$ac_package=no ;;

16335

16336

--x)

16337

@@ -1730,6 +1748,7 @@

16337

@@ -1735,6 +1753,7 @@

16338

CFLAGS C compiler flags

16339

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

16340

nonstandard directory <lib dir>

16342

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

16343

you have headers in a nonstandard directory <include dir>

16344

PKG_CONFIG path to pkg-config utility

16345

@@ -1809,6 +1828,10 @@

16345

@@ -1818,6 +1837,10 @@

16346

MIXER_CFLAGS

16347

C compiler flags for MIXER, overriding pkg-config

16348

MIXER_LIBS linker flags for MIXER, overriding pkg-config

16353

16354

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

16355

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

16356

@@ -1874,7 +1897,7 @@

16356

@@ -1883,7 +1906,7 @@

16357

if $ac_init_version; then

16358

cat <<\_ACEOF

16359

gnome-applets configure 2.21.2

16359

gnome-applets configure 2.21.4

16360

-generated by GNU Autoconf 2.60

16361

+generated by GNU Autoconf 2.61

16362

16363

16364

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

16365

@@ -1888,7 +1911,7 @@

16365

@@ -1897,7 +1920,7 @@

16366

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

16367

16368

It was created by gnome-applets $as_me 2.21.2, which was

16368

It was created by gnome-applets $as_me 2.21.4, which was

16369

-generated by GNU Autoconf 2.60. Invocation command line was

16370

+generated by GNU Autoconf 2.61. Invocation command line was

16371

16372

$ $0 $@

16373

16374

@@ -2313,7 +2336,7 @@

16374

@@ -2322,7 +2345,7 @@

16375

# by default.

16376

for ac_prog in ginstall scoinst install; do

16377

for ac_exec_ext in '' $ac_executable_extensions; do

16380

if test $ac_prog = install &&

16381

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

16382

# AIX install. It has an incompatible calling convention.

16383

@@ -2441,7 +2464,7 @@

16383

@@ -2450,7 +2473,7 @@

16384

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

16385

for ac_prog in mkdir gmkdir; do

16386

for ac_exec_ext in '' $ac_executable_extensions; do

16389

case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

16390

'mkdir (GNU coreutils) '* | \

16391

'mkdir (coreutils) '* | \

16392

@@ -2494,7 +2517,7 @@

16392

@@ -2503,7 +2526,7 @@

16393

IFS=$as_save_IFS

16394

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

16395

for ac_exec_ext in '' $ac_executable_extensions; do

16398

ac_cv_prog_AWK="$ac_prog"

16399

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16400

break 2

16401

@@ -2633,7 +2656,7 @@

16401

@@ -2642,7 +2665,7 @@

16402

IFS=$as_save_IFS

16403

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

16404

for ac_exec_ext in '' $ac_executable_extensions; do

16407

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

16408

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16409

break 2

16410

@@ -2673,7 +2696,7 @@

16410

@@ -2682,7 +2705,7 @@

16411

IFS=$as_save_IFS

16412

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

16413

for ac_exec_ext in '' $ac_executable_extensions; do

16416

ac_cv_prog_ac_ct_STRIP="strip"

16417

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16418

break 2

16419

@@ -2727,14 +2750,6 @@

16419

@@ -2736,14 +2759,6 @@

16420

16421

16422

16431

16432

16433

GTK_REQUIRED=2.11.0

16434

@@ -2750,6 +2765,7 @@

16434

@@ -2759,6 +2774,7 @@

16435

LIBGAIL_REQUIRED=1.1.0

16436

LIBXKLAVIER_REQUIRED=2.91

16437

LIBWNCK_REQUIRED=2.9.3

16439

SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3

16440

LIBGNOME_DESKTOP_REQUIRED=2.11.1

16441

LIBNOTIFY_REQUIRED=0.3.2

16442

@@ -2869,7 +2885,7 @@

16442

@@ -2879,7 +2895,7 @@

16443

IFS=$as_save_IFS

16444

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

16445

for ac_exec_ext in '' $ac_executable_extensions; do

16448

ac_cv_prog_CC="${ac_tool_prefix}gcc"

16449

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16450

break 2

16451

@@ -2909,7 +2925,7 @@

16451

@@ -2919,7 +2935,7 @@

16452

IFS=$as_save_IFS

16453

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

16454

for ac_exec_ext in '' $ac_executable_extensions; do

16457

ac_cv_prog_ac_ct_CC="gcc"

16458

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16459

break 2

16460

@@ -2966,7 +2982,7 @@

16460

@@ -2976,7 +2992,7 @@

16461

IFS=$as_save_IFS

16462

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

16463

for ac_exec_ext in '' $ac_executable_extensions; do

16466

ac_cv_prog_CC="${ac_tool_prefix}cc"

16467

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16468

break 2

16469

@@ -3007,7 +3023,7 @@

16469

@@ -3017,7 +3033,7 @@

16470

IFS=$as_save_IFS

16471

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

16472

for ac_exec_ext in '' $ac_executable_extensions; do

16475

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

16476

ac_prog_rejected=yes

16477

continue

16478

@@ -3065,7 +3081,7 @@

16478

@@ -3075,7 +3091,7 @@

16479

IFS=$as_save_IFS

16480

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

16481

for ac_exec_ext in '' $ac_executable_extensions; do

16484

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

16485

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16486

break 2

16487

@@ -3109,7 +3125,7 @@

16487

@@ -3119,7 +3135,7 @@

16488

IFS=$as_save_IFS

16489

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

16490

for ac_exec_ext in '' $ac_executable_extensions; do

16493

ac_cv_prog_ac_ct_CC="$ac_prog"

16494

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16495

break 2

16496

@@ -3250,7 +3266,7 @@

16496

@@ -3260,7 +3276,7 @@

16497

# in a Makefile. We should not override ac_cv_exeext if it was cached,

16498

# so that the user can short-circuit this test for compilers unknown to

16499

# Autoconf.

16502

do

16503

test -f "$ac_file" || continue

16504

case $ac_file in

16505

@@ -3278,6 +3294,12 @@

16505

@@ -3288,6 +3304,12 @@

16506

test "$ac_cv_exeext" = no && ac_cv_exeext=

16507

16508

else

16515

echo "$as_me: failed program was:" >&5

16516

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

16517

16518

@@ -3289,8 +3311,6 @@

16518

@@ -3299,8 +3321,6 @@

16519

fi

16520

16521

ac_exeext=$ac_cv_exeext

16524

16525

# Check that the compiler produces executables we can run. If not, either

16526

# the compiler is broken, or we cross compile.

16527

@@ -3468,27 +3488,10 @@

16527

@@ -3478,27 +3498,10 @@

16528

rm -f conftest.er1

16529

cat conftest.err >&5

16530

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

16556

ac_compiler_gnu=yes

16557

else

16558

echo "$as_me: failed program was:" >&5

16559

@@ -3543,27 +3546,10 @@

16559

@@ -3553,27 +3556,10 @@

16560

rm -f conftest.er1

16561

cat conftest.err >&5

16562

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

16588

ac_cv_prog_cc_g=yes

16589

else

16590

echo "$as_me: failed program was:" >&5

16591

@@ -3598,27 +3584,10 @@

16591

@@ -3608,27 +3594,10 @@

16592

rm -f conftest.er1

16593

cat conftest.err >&5

16594

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

16620

:

16621

else

16622

echo "$as_me: failed program was:" >&5

16623

@@ -3654,27 +3623,10 @@

16623

@@ -3664,27 +3633,10 @@

16624

rm -f conftest.er1

16625

cat conftest.err >&5

16626

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

16652

ac_cv_prog_cc_g=yes

16653

else

16654

echo "$as_me: failed program was:" >&5

16655

@@ -3790,27 +3742,10 @@

16655

@@ -3800,27 +3752,10 @@

16656

rm -f conftest.er1

16657

cat conftest.err >&5

16658

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

16684

ac_cv_prog_cc_c89=$ac_arg

16685

else

16686

echo "$as_me: failed program was:" >&5

16687

@@ -4049,7 +3984,7 @@

16687

@@ -4059,7 +3994,7 @@

16688

IFS=$as_save_IFS

16689

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

16690

for ac_exec_ext in '' $ac_executable_extensions; do

16693

ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"

16694

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16695

break 2

16696

@@ -4129,27 +4064,11 @@

16696

@@ -4139,27 +4074,11 @@

16697

rm -f conftest.er1

16698

cat conftest.err >&5

16699

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

16726

DATADIRNAME=share

16727

else

16728

echo "$as_me: failed program was:" >&5

16729

@@ -4220,27 +4139,11 @@

16729

@@ -4230,27 +4149,11 @@

16730

rm -f conftest.er1

16731

cat conftest.err >&5

16732

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

16759

ac_cv_func_bind_textdomain_codeset=yes

16760

else

16761

echo "$as_me: failed program was:" >&5

16762

@@ -4249,7 +4152,7 @@

16762

@@ -4259,7 +4162,7 @@

16763

ac_cv_func_bind_textdomain_codeset=no

16764

fi

16765

16768

conftest$ac_exeext conftest.$ac_ext

16769

fi

16770

{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

16771

@@ -4267,7 +4170,7 @@

16771

@@ -4277,7 +4180,7 @@

16772

esac

16773

fi

16774

16777

conftest$ac_exeext conftest.$ac_ext

16778

fi

16779

16780

@@ -4301,7 +4204,7 @@

16780

@@ -4311,7 +4214,7 @@

16781

IFS=$as_save_IFS

16782

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

16783

for ac_exec_ext in '' $ac_executable_extensions; do

16786

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

16787

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16788

break 2

16789

@@ -4344,7 +4247,7 @@

16789

@@ -4354,7 +4257,7 @@

16790

IFS=$as_save_IFS

16791

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

16792

for ac_exec_ext in '' $ac_executable_extensions; do

16795

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

16796

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16797

break 2

16798

@@ -4422,7 +4325,7 @@

16798

@@ -4432,7 +4335,7 @@

16799

IFS=$as_save_IFS

16800

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

16801

for ac_exec_ext in '' $ac_executable_extensions; do

16804

ac_cv_prog_CC="${ac_tool_prefix}gcc"

16805

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16806

break 2

16807

@@ -4462,7 +4365,7 @@

16807

@@ -4472,7 +4375,7 @@

16808

IFS=$as_save_IFS

16809

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

16810

for ac_exec_ext in '' $ac_executable_extensions; do

16813

ac_cv_prog_ac_ct_CC="gcc"

16814

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16815

break 2

16816

@@ -4519,7 +4422,7 @@

16816

@@ -4529,7 +4432,7 @@

16817

IFS=$as_save_IFS

16818

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

16819

for ac_exec_ext in '' $ac_executable_extensions; do

16822

ac_cv_prog_CC="${ac_tool_prefix}cc"

16823

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16824

break 2

16825

@@ -4560,7 +4463,7 @@

16825

@@ -4570,7 +4473,7 @@

16826

IFS=$as_save_IFS

16827

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

16828

for ac_exec_ext in '' $ac_executable_extensions; do

16831

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

16832

ac_prog_rejected=yes

16833

continue

16834

@@ -4618,7 +4521,7 @@

16834

@@ -4628,7 +4531,7 @@

16835

IFS=$as_save_IFS

16836

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

16837

for ac_exec_ext in '' $ac_executable_extensions; do

16840

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

16841

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16842

break 2

16843

@@ -4662,7 +4565,7 @@

16843

@@ -4672,7 +4575,7 @@

16844

IFS=$as_save_IFS

16845

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

16846

for ac_exec_ext in '' $ac_executable_extensions; do

16849

ac_cv_prog_ac_ct_CC="$ac_prog"

16850

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16851

break 2

16852

@@ -4782,27 +4685,10 @@

16852

@@ -4792,27 +4695,10 @@

16853

rm -f conftest.er1

16854

cat conftest.err >&5

16855

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

16881

ac_compiler_gnu=yes

16882

else

16883

echo "$as_me: failed program was:" >&5

16884

@@ -4857,27 +4743,10 @@

16884

@@ -4867,27 +4753,10 @@

16885

rm -f conftest.er1

16886

cat conftest.err >&5

16887

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

16913

ac_cv_prog_cc_g=yes

16914

else

16915

echo "$as_me: failed program was:" >&5

16916

@@ -4912,27 +4781,10 @@

16916

@@ -4922,27 +4791,10 @@

16917

rm -f conftest.er1

16918

cat conftest.err >&5

16919

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

16945

:

16946

else

16947

echo "$as_me: failed program was:" >&5

16948

@@ -4968,27 +4820,10 @@

16948

@@ -4978,27 +4830,10 @@

16949

rm -f conftest.er1

16950

cat conftest.err >&5

16951

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

16977

ac_cv_prog_cc_g=yes

16978

else

16979

echo "$as_me: failed program was:" >&5

16980

@@ -5104,27 +4939,10 @@

16980

@@ -5114,27 +4949,10 @@

16981

rm -f conftest.er1

16982

cat conftest.err >&5

16983

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

17009

ac_cv_prog_cc_c89=$ac_arg

17010

else

17011

echo "$as_me: failed program was:" >&5

17012

@@ -5317,27 +5135,11 @@

17012

@@ -5327,27 +5145,11 @@

17013

rm -f conftest.er1

17014

cat conftest.err >&5

17015

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

17042

ac_cv_search_strerror=$ac_res

17043

else

17044

echo "$as_me: failed program was:" >&5

17045

@@ -5346,7 +5148,7 @@

17045

@@ -5356,7 +5158,7 @@

17046

17047

fi

17048

17051

conftest$ac_exeext

17052

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

17053

break

17054

@@ -5420,17 +5222,10 @@

17055

rm -f conftest.er1

17056

cat conftest.err >&5

17057

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

17058

- (exit $ac_status); } >/dev/null; then

17059

- if test -s conftest.err; then

17060

- ac_cpp_err=$ac_c_preproc_warn_flag

17061

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17062

- else

17063

- ac_cpp_err=

17064

- fi

17065

-else

17066

- ac_cpp_err=yes

17067

-fi

17068

-if test -z "$ac_cpp_err"; then

17069

+ (exit $ac_status); } >/dev/null && {

17070

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17071

+ test ! -s conftest.err

17072

+ }; then

17073

:

17074

else

17075

echo "$as_me: failed program was:" >&5

17076

@@ -5464,17 +5259,10 @@

17077

rm -f conftest.er1

17078

cat conftest.err >&5

17079

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

17080

- (exit $ac_status); } >/dev/null; then

17081

- if test -s conftest.err; then

17082

- ac_cpp_err=$ac_c_preproc_warn_flag

17083

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17084

- else

17085

- ac_cpp_err=

17086

- fi

17087

-else

17088

- ac_cpp_err=yes

17089

-fi

17090

-if test -z "$ac_cpp_err"; then

17091

+ (exit $ac_status); } >/dev/null && {

17092

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17093

+ test ! -s conftest.err

17094

+ }; then

17095

# Broken: success on invalid input.

17096

continue

17097

else

17098

@@ -5539,17 +5327,10 @@

17099

rm -f conftest.er1

17100

cat conftest.err >&5

17101

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

17102

- (exit $ac_status); } >/dev/null; then

17103

- if test -s conftest.err; then

17104

- ac_cpp_err=$ac_c_preproc_warn_flag

17105

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17106

- else

17107

- ac_cpp_err=

17108

- fi

17109

-else

17110

- ac_cpp_err=yes

17111

-fi

17112

-if test -z "$ac_cpp_err"; then

17113

+ (exit $ac_status); } >/dev/null && {

17114

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17115

+ test ! -s conftest.err

17116

+ }; then

17117

:

17118

else

17119

echo "$as_me: failed program was:" >&5

17120

@@ -5583,17 +5364,10 @@

17121

rm -f conftest.er1

17122

cat conftest.err >&5

17123

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

17124

- (exit $ac_status); } >/dev/null; then

17125

- if test -s conftest.err; then

17126

- ac_cpp_err=$ac_c_preproc_warn_flag

17127

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17128

- else

17129

- ac_cpp_err=

17130

- fi

17131

-else

17132

- ac_cpp_err=yes

17133

-fi

17134

-if test -z "$ac_cpp_err"; then

17135

+ (exit $ac_status); } >/dev/null && {

17136

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17137

+ test ! -s conftest.err

17138

+ }; then

17139

# Broken: success on invalid input.

17140

continue

17141

else

17142

@@ -5648,7 +5422,7 @@

17054

@@ -5430,17 +5232,10 @@

17055

rm -f conftest.er1

17056

cat conftest.err >&5

17057

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

17058

- (exit $ac_status); } >/dev/null; then

17059

- if test -s conftest.err; then

17060

- ac_cpp_err=$ac_c_preproc_warn_flag

17061

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17062

- else

17063

- ac_cpp_err=

17064

- fi

17065

-else

17066

- ac_cpp_err=yes

17067

-fi

17068

-if test -z "$ac_cpp_err"; then

17069

+ (exit $ac_status); } >/dev/null && {

17070

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17071

+ test ! -s conftest.err

17072

+ }; then

17073

:

17074

else

17075

echo "$as_me: failed program was:" >&5

17076

@@ -5474,17 +5269,10 @@

17077

rm -f conftest.er1

17078

cat conftest.err >&5

17079

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

17080

- (exit $ac_status); } >/dev/null; then

17081

- if test -s conftest.err; then

17082

- ac_cpp_err=$ac_c_preproc_warn_flag

17083

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17084

- else

17085

- ac_cpp_err=

17086

- fi

17087

-else

17088

- ac_cpp_err=yes

17089

-fi

17090

-if test -z "$ac_cpp_err"; then

17091

+ (exit $ac_status); } >/dev/null && {

17092

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17093

+ test ! -s conftest.err

17094

+ }; then

17095

# Broken: success on invalid input.

17096

continue

17097

else

17098

@@ -5549,17 +5337,10 @@

17099

rm -f conftest.er1

17100

cat conftest.err >&5

17101

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

17102

- (exit $ac_status); } >/dev/null; then

17103

- if test -s conftest.err; then

17104

- ac_cpp_err=$ac_c_preproc_warn_flag

17105

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17106

- else

17107

- ac_cpp_err=

17108

- fi

17109

-else

17110

- ac_cpp_err=yes

17111

-fi

17112

-if test -z "$ac_cpp_err"; then

17113

+ (exit $ac_status); } >/dev/null && {

17114

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17115

+ test ! -s conftest.err

17116

+ }; then

17117

:

17118

else

17119

echo "$as_me: failed program was:" >&5

17120

@@ -5593,17 +5374,10 @@

17121

rm -f conftest.er1

17122

cat conftest.err >&5

17123

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

17124

- (exit $ac_status); } >/dev/null; then

17125

- if test -s conftest.err; then

17126

- ac_cpp_err=$ac_c_preproc_warn_flag

17127

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17128

- else

17129

- ac_cpp_err=

17130

- fi

17131

-else

17132

- ac_cpp_err=yes

17133

-fi

17134

-if test -z "$ac_cpp_err"; then

17135

+ (exit $ac_status); } >/dev/null && {

17136

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17137

+ test ! -s conftest.err

17138

+ }; then

17139

# Broken: success on invalid input.

17140

continue

17141

else

17142

@@ -5658,7 +5432,7 @@

17143

for ac_prog in grep ggrep; do

17144

for ac_exec_ext in '' $ac_executable_extensions; do

17145

ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

17148

# Check for GNU ac_path_GREP and select it if it is found.

17149

# Check for GNU $ac_path_GREP

17150

case `"$ac_path_GREP" --version 2>&1` in

17151

@@ -5730,7 +5504,7 @@

17151

@@ -5740,7 +5514,7 @@

17152

for ac_prog in egrep; do

17153

for ac_exec_ext in '' $ac_executable_extensions; do

17154

ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

17157

# Check for GNU ac_path_EGREP and select it if it is found.

17158

# Check for GNU $ac_path_EGREP

17159

case `"$ac_path_EGREP" --version 2>&1` in

17160

@@ -5826,27 +5600,10 @@

17160

@@ -5836,27 +5610,10 @@

17161

rm -f conftest.er1

17162

cat conftest.err >&5

17163

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

17189

ac_cv_header_stdc=yes

17190

else

17191

echo "$as_me: failed program was:" >&5

17192

@@ -6149,12 +5906,13 @@

17192

@@ -6159,12 +5916,13 @@

17193

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

17194

for lt_ac_prog in sed gsed; do

17195

for ac_exec_ext in '' $ac_executable_extensions; do

17204

lt_ac_max=0

17205

lt_ac_count=0

17206

# Add /usr/xpg4/bin/sed as it is typically found on Solaris

17207

@@ -6189,6 +5947,7 @@

17207

@@ -6199,6 +5957,7 @@

17208

fi

17209

17210

SED=$lt_cv_path_SED

17212

{ echo "$as_me:$LINENO: result: $SED" >&5

17213

echo "${ECHO_T}$SED" >&6; }

17214

17215

@@ -6388,8 +6147,8 @@

17215

@@ -6398,8 +6157,8 @@

17216

echo "${ECHO_T}no, using $LN_S" >&6; }

17217

fi

17218

17223

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

17224

echo $ECHO_N "(cached) $ECHO_C" >&6

17225

else

17226

@@ -6430,16 +6189,22 @@

17226

@@ -6440,16 +6199,22 @@

17227

17228

mingw* | pw32*)

17229

# Base MSYS/MinGW do not provide the 'file' command needed by

17250

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

17251

case $host_cpu in

17252

i*86 )

17253

@@ -6477,7 +6242,7 @@

17253

@@ -6487,7 +6252,7 @@

17254

esac

17255

;;

17256

17259

# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here

17260

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'

17261

;;

17262

@@ -6493,11 +6258,11 @@

17262

@@ -6503,11 +6268,11 @@

17263

;;

17264

17265

# This must be Linux ELF.

17273

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

17274

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

17275

else

17276

@@ -6527,6 +6292,10 @@

17276

@@ -6537,6 +6302,10 @@

17277

lt_cv_deplibs_check_method=pass_all

17278

;;

17279

17284

solaris*)

17285

lt_cv_deplibs_check_method=pass_all

17286

;;

17287

@@ -6613,7 +6382,7 @@

17287

@@ -6623,7 +6392,7 @@

17288

;;

17289

*-*-irix6*)

17290

# Find out which ABI we are using.

17291

- echo '#line 6616 "configure"' > conftest.$ac_ext

17292

+ echo '#line 6385 "configure"' > conftest.$ac_ext

17291

- echo '#line 6626 "configure"' > conftest.$ac_ext

17292

+ echo '#line 6395 "configure"' > conftest.$ac_ext

17293

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

17294

(eval $ac_compile) 2>&5

17295

ac_status=$?

17296

@@ -6648,7 +6417,8 @@

17296

@@ -6658,7 +6427,8 @@

17297

rm -rf conftest*

17298

;;

17299

17303

# Find out which ABI we are using.

17304

echo 'int i;' > conftest.$ac_ext

17305

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

17306

@@ -6659,6 +6429,9 @@

17306

@@ -6669,6 +6439,9 @@

17307

case `/usr/bin/file conftest.o` in

17308

*32-bit*)

17309

case $host in

17313

x86_64-*linux*)

17314

LD="${LD-ld} -m elf_i386"

17315

;;

17316

@@ -6675,6 +6448,9 @@

17316

@@ -6685,6 +6458,9 @@

17317

;;

17318

*64-bit*)

17319

case $host in

17323

x86_64-*linux*)

17324

LD="${LD-ld} -m elf_x86_64"

17325

;;

17326

@@ -6737,27 +6513,11 @@

17326

@@ -6747,27 +6523,11 @@

17327

rm -f conftest.er1

17328

cat conftest.err >&5

17329

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

17356

lt_cv_cc_needs_belf=yes

17357

else

17358

echo "$as_me: failed program was:" >&5

17359

@@ -6766,7 +6526,7 @@

17359

@@ -6776,7 +6536,7 @@

17360

lt_cv_cc_needs_belf=no

17361

fi

17362

17365

conftest$ac_exeext conftest.$ac_ext

17366

ac_ext=c

17367

ac_cpp='$CPP $CPPFLAGS'

17368

@@ -6850,27 +6610,10 @@

17368

@@ -6860,27 +6620,10 @@

17369

rm -f conftest.er1

17370

cat conftest.err >&5

17371

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

17397

eval "$as_ac_Header=yes"

17398

else

17399

echo "$as_me: failed program was:" >&5

17400

@@ -6933,27 +6676,10 @@

17400

@@ -6943,27 +6686,10 @@

17401

rm -f conftest.er1

17402

cat conftest.err >&5

17403

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

17429

ac_header_compiler=yes

17430

else

17431

echo "$as_me: failed program was:" >&5

17432

@@ -6989,17 +6715,10 @@

17432

@@ -6999,17 +6725,10 @@

17433

rm -f conftest.er1

17434

cat conftest.err >&5

17435

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

17451

ac_header_preproc=yes

17452

else

17453

echo "$as_me: failed program was:" >&5

17454

@@ -7086,7 +6805,7 @@

17454

@@ -7096,7 +6815,7 @@

17455

IFS=$as_save_IFS

17456

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

17457

for ac_exec_ext in '' $ac_executable_extensions; do

17460

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

17461

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17462

break 2

17463

@@ -7130,7 +6849,7 @@

17463

@@ -7140,7 +6859,7 @@

17464

IFS=$as_save_IFS

17465

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

17466

for ac_exec_ext in '' $ac_executable_extensions; do

17469

ac_cv_prog_ac_ct_CXX="$ac_prog"

17470

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17471

break 2

17472

@@ -7243,27 +6962,10 @@

17472

@@ -7253,27 +6972,10 @@

17473

rm -f conftest.er1

17474

cat conftest.err >&5

17475

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

17501

ac_compiler_gnu=yes

17502

else

17503

echo "$as_me: failed program was:" >&5

17504

@@ -7318,27 +7020,10 @@

17505

rm -f conftest.er1

17506

cat conftest.err >&5

17507

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

17508

- (exit $ac_status); } &&

17509

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

17510

- { (case "(($ac_try" in

17511

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

17512

- *) ac_try_echo=$ac_try;;

17513

-esac

17514

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

17515

- (eval "$ac_try") 2>&5

17516

- ac_status=$?

17517

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

17518

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

17519

- { ac_try='test -s conftest.$ac_objext'

17520

- { (case "(($ac_try" in

17521

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

17522

- *) ac_try_echo=$ac_try;;

17523

-esac

17524

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

17525

- (eval "$ac_try") 2>&5

17526

- ac_status=$?

17527

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

17528

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

17529

+ (exit $ac_status); } && {

17530

+ test -z "$ac_cxx_werror_flag" ||

17531

+ test ! -s conftest.err

17532

+ } && test -s conftest.$ac_objext; then

17533

ac_cv_prog_cxx_g=yes

17534

else

17535

echo "$as_me: failed program was:" >&5

17536

@@ -7373,27 +7058,10 @@

17537

rm -f conftest.er1

17538

cat conftest.err >&5

17539

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

17540

- (exit $ac_status); } &&

17541

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

17542

- { (case "(($ac_try" in

17543

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

17544

- *) ac_try_echo=$ac_try;;

17545

-esac

17546

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

17547

- (eval "$ac_try") 2>&5

17548

- ac_status=$?

17549

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

17550

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

17551

- { ac_try='test -s conftest.$ac_objext'

17552

- { (case "(($ac_try" in

17553

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

17554

- *) ac_try_echo=$ac_try;;

17555

-esac

17556

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

17557

- (eval "$ac_try") 2>&5

17558

- ac_status=$?

17559

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

17560

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

17561

+ (exit $ac_status); } && {

17562

+ test -z "$ac_cxx_werror_flag" ||

17563

+ test ! -s conftest.err

17564

+ } && test -s conftest.$ac_objext; then

17565

:

17566

else

17567

echo "$as_me: failed program was:" >&5

17568

@@ -7429,27 +7097,10 @@

17569

rm -f conftest.er1

17570

cat conftest.err >&5

17571

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

17572

- (exit $ac_status); } &&

17573

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

17574

- { (case "(($ac_try" in

17575

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

17576

- *) ac_try_echo=$ac_try;;

17577

-esac

17578

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

17579

- (eval "$ac_try") 2>&5

17580

- ac_status=$?

17581

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

17582

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

17583

- { ac_try='test -s conftest.$ac_objext'

17584

- { (case "(($ac_try" in

17585

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

17586

- *) ac_try_echo=$ac_try;;

17587

-esac

17588

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

17589

- (eval "$ac_try") 2>&5

17590

- ac_status=$?

17591

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

17592

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

17593

+ (exit $ac_status); } && {

17594

+ test -z "$ac_cxx_werror_flag" ||

17595

+ test ! -s conftest.err

17596

+ } && test -s conftest.$ac_objext; then

17597

ac_cv_prog_cxx_g=yes

17598

else

17599

echo "$as_me: failed program was:" >&5

17600

@@ -7651,17 +7302,10 @@

17601

rm -f conftest.er1

17602

cat conftest.err >&5

17603

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

17604

- (exit $ac_status); } >/dev/null; then

17605

- if test -s conftest.err; then

17606

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17607

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17608

- else

17609

- ac_cpp_err=

17610

- fi

17611

-else

17612

- ac_cpp_err=yes

17613

-fi

17614

-if test -z "$ac_cpp_err"; then

17615

+ (exit $ac_status); } >/dev/null && {

17616

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17617

+ test ! -s conftest.err

17618

+ }; then

17619

:

17620

else

17621

echo "$as_me: failed program was:" >&5

17622

@@ -7695,17 +7339,10 @@

17623

rm -f conftest.er1

17624

cat conftest.err >&5

17625

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

17626

- (exit $ac_status); } >/dev/null; then

17627

- if test -s conftest.err; then

17628

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17629

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17630

- else

17631

- ac_cpp_err=

17632

- fi

17633

-else

17634

- ac_cpp_err=yes

17635

-fi

17636

-if test -z "$ac_cpp_err"; then

17637

+ (exit $ac_status); } >/dev/null && {

17638

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17639

+ test ! -s conftest.err

17640

+ }; then

17641

# Broken: success on invalid input.

17642

continue

17643

else

17644

@@ -7770,17 +7407,10 @@

17645

rm -f conftest.er1

17646

cat conftest.err >&5

17647

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

17648

- (exit $ac_status); } >/dev/null; then

17649

- if test -s conftest.err; then

17650

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17651

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17652

- else

17653

- ac_cpp_err=

17654

- fi

17655

-else

17656

- ac_cpp_err=yes

17657

-fi

17658

-if test -z "$ac_cpp_err"; then

17659

+ (exit $ac_status); } >/dev/null && {

17660

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17661

+ test ! -s conftest.err

17662

+ }; then

17663

:

17664

else

17665

echo "$as_me: failed program was:" >&5

17666

@@ -7814,17 +7444,10 @@

17667

rm -f conftest.er1

17668

cat conftest.err >&5

17669

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

17670

- (exit $ac_status); } >/dev/null; then

17671

- if test -s conftest.err; then

17672

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17673

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17674

- else

17675

- ac_cpp_err=

17676

- fi

17677

-else

17678

- ac_cpp_err=yes

17679

-fi

17680

-if test -z "$ac_cpp_err"; then

17681

+ (exit $ac_status); } >/dev/null && {

17682

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17683

+ test ! -s conftest.err

17684

+ }; then

17685

# Broken: success on invalid input.

17686

continue

17687

else

17688

@@ -7865,7 +7488,7 @@

17504

@@ -7328,27 +7030,10 @@

17505

rm -f conftest.er1

17506

cat conftest.err >&5

17507

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

17508

- (exit $ac_status); } &&

17509

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

17510

- { (case "(($ac_try" in

17511

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

17512

- *) ac_try_echo=$ac_try;;

17513

-esac

17514

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

17515

- (eval "$ac_try") 2>&5

17516

- ac_status=$?

17517

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

17518

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

17519

- { ac_try='test -s conftest.$ac_objext'

17520

- { (case "(($ac_try" in

17521

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

17522

- *) ac_try_echo=$ac_try;;

17523

-esac

17524

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

17525

- (eval "$ac_try") 2>&5

17526

- ac_status=$?

17527

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

17528

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

17529

+ (exit $ac_status); } && {

17530

+ test -z "$ac_cxx_werror_flag" ||

17531

+ test ! -s conftest.err

17532

+ } && test -s conftest.$ac_objext; then

17533

ac_cv_prog_cxx_g=yes

17534

else

17535

echo "$as_me: failed program was:" >&5

17536

@@ -7383,27 +7068,10 @@

17537

rm -f conftest.er1

17538

cat conftest.err >&5

17539

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

17540

- (exit $ac_status); } &&

17541

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

17542

- { (case "(($ac_try" in

17543

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

17544

- *) ac_try_echo=$ac_try;;

17545

-esac

17546

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

17547

- (eval "$ac_try") 2>&5

17548

- ac_status=$?

17549

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

17550

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

17551

- { ac_try='test -s conftest.$ac_objext'

17552

- { (case "(($ac_try" in

17553

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

17554

- *) ac_try_echo=$ac_try;;

17555

-esac

17556

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

17557

- (eval "$ac_try") 2>&5

17558

- ac_status=$?

17559

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

17560

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

17561

+ (exit $ac_status); } && {

17562

+ test -z "$ac_cxx_werror_flag" ||

17563

+ test ! -s conftest.err

17564

+ } && test -s conftest.$ac_objext; then

17565

:

17566

else

17567

echo "$as_me: failed program was:" >&5

17568

@@ -7439,27 +7107,10 @@

17569

rm -f conftest.er1

17570

cat conftest.err >&5

17571

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

17572

- (exit $ac_status); } &&

17573

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

17574

- { (case "(($ac_try" in

17575

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

17576

- *) ac_try_echo=$ac_try;;

17577

-esac

17578

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

17579

- (eval "$ac_try") 2>&5

17580

- ac_status=$?

17581

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

17582

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

17583

- { ac_try='test -s conftest.$ac_objext'

17584

- { (case "(($ac_try" in

17585

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

17586

- *) ac_try_echo=$ac_try;;

17587

-esac

17588

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

17589

- (eval "$ac_try") 2>&5

17590

- ac_status=$?

17591

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

17592

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

17593

+ (exit $ac_status); } && {

17594

+ test -z "$ac_cxx_werror_flag" ||

17595

+ test ! -s conftest.err

17596

+ } && test -s conftest.$ac_objext; then

17597

ac_cv_prog_cxx_g=yes

17598

else

17599

echo "$as_me: failed program was:" >&5

17600

@@ -7661,17 +7312,10 @@

17601

rm -f conftest.er1

17602

cat conftest.err >&5

17603

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

17604

- (exit $ac_status); } >/dev/null; then

17605

- if test -s conftest.err; then

17606

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17607

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17608

- else

17609

- ac_cpp_err=

17610

- fi

17611

-else

17612

- ac_cpp_err=yes

17613

-fi

17614

-if test -z "$ac_cpp_err"; then

17615

+ (exit $ac_status); } >/dev/null && {

17616

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17617

+ test ! -s conftest.err

17618

+ }; then

17619

:

17620

else

17621

echo "$as_me: failed program was:" >&5

17622

@@ -7705,17 +7349,10 @@

17623

rm -f conftest.er1

17624

cat conftest.err >&5

17625

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

17626

- (exit $ac_status); } >/dev/null; then

17627

- if test -s conftest.err; then

17628

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17629

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17630

- else

17631

- ac_cpp_err=

17632

- fi

17633

-else

17634

- ac_cpp_err=yes

17635

-fi

17636

-if test -z "$ac_cpp_err"; then

17637

+ (exit $ac_status); } >/dev/null && {

17638

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17639

+ test ! -s conftest.err

17640

+ }; then

17641

# Broken: success on invalid input.

17642

continue

17643

else

17644

@@ -7780,17 +7417,10 @@

17645

rm -f conftest.er1

17646

cat conftest.err >&5

17647

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

17648

- (exit $ac_status); } >/dev/null; then

17649

- if test -s conftest.err; then

17650

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17651

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17652

- else

17653

- ac_cpp_err=

17654

- fi

17655

-else

17656

- ac_cpp_err=yes

17657

-fi

17658

-if test -z "$ac_cpp_err"; then

17659

+ (exit $ac_status); } >/dev/null && {

17660

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17661

+ test ! -s conftest.err

17662

+ }; then

17663

:

17664

else

17665

echo "$as_me: failed program was:" >&5

17666

@@ -7824,17 +7454,10 @@

17667

rm -f conftest.er1

17668

cat conftest.err >&5

17669

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

17670

- (exit $ac_status); } >/dev/null; then

17671

- if test -s conftest.err; then

17672

- ac_cpp_err=$ac_cxx_preproc_warn_flag

17673

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

17674

- else

17675

- ac_cpp_err=

17676

- fi

17677

-else

17678

- ac_cpp_err=yes

17679

-fi

17680

-if test -z "$ac_cpp_err"; then

17681

+ (exit $ac_status); } >/dev/null && {

17682

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

17683

+ test ! -s conftest.err

17684

+ }; then

17685

# Broken: success on invalid input.

17686

continue

17687

else

17688

@@ -7875,7 +7498,7 @@

17689

ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

17690

ac_compiler_gnu=$ac_cv_f77_compiler_gnu

17691

if test -n "$ac_tool_prefix"; then

17694

do

17695

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

17696

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

17697

@@ -7883,7 +7506,7 @@

17697

@@ -7893,7 +7516,7 @@

17698

IFS=$as_save_IFS

17699

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

17700

for ac_exec_ext in '' $ac_executable_extensions; do

17703

ac_cv_prog_F77="$ac_tool_prefix$ac_prog"

17704

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17705

break 2

17706

@@ -7909,7 +7532,7 @@

17706

@@ -7919,7 +7542,7 @@

17707

fi

17708

if test -z "$F77"; then

17709

ac_ct_F77=$F77

17712

do

17713

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

17714

set dummy $ac_prog; ac_word=$2

17715

@@ -7927,7 +7550,7 @@

17715

@@ -7937,7 +7560,7 @@

17716

IFS=$as_save_IFS

17717

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

17718

for ac_exec_ext in '' $ac_executable_extensions; do

17721

ac_cv_prog_ac_ct_F77="$ac_prog"

17722

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17723

break 2

17724

@@ -8034,27 +7657,10 @@

17724

@@ -8044,27 +7667,10 @@

17725

rm -f conftest.er1

17726

cat conftest.err >&5

17727

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

17753

ac_compiler_gnu=yes

17754

else

17755

echo "$as_me: failed program was:" >&5

17756

@@ -8097,27 +7703,10 @@

17756

@@ -8107,27 +7713,10 @@

17757

rm -f conftest.er1

17758

cat conftest.err >&5

17759

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

17785

ac_cv_prog_f77_g=yes

17786

else

17787

echo "$as_me: failed program was:" >&5

17788

@@ -8244,24 +7833,27 @@

17788

@@ -8254,24 +7843,27 @@

17789

fi

17790

;;

17791

*)

17830

;;

17831

esac

17832

17833

@@ -8278,6 +7870,7 @@

17833

@@ -8288,6 +7880,7 @@

17834

17835

17836

17838

# Check for command to grab the raw symbol name followed by C symbol from nm.

17839

{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

17840

echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }

17841

@@ -8315,7 +7908,7 @@

17841

@@ -8325,7 +7918,7 @@

17842

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

17843

lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (lt_ptr) \&\2},/p'"

17844

;;

17847

if test "$host_cpu" = ia64; then

17848

symcode='[ABCDGIRSTW]'

17849

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

17850

@@ -8572,7 +8165,7 @@

17850

@@ -8582,7 +8175,7 @@

17851

IFS=$as_save_IFS

17852

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

17853

for ac_exec_ext in '' $ac_executable_extensions; do

17856

ac_cv_prog_AR="${ac_tool_prefix}ar"

17857

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17858

break 2

17859

@@ -8612,7 +8205,7 @@

17859

@@ -8622,7 +8215,7 @@

17860

IFS=$as_save_IFS

17861

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

17862

for ac_exec_ext in '' $ac_executable_extensions; do

17865

ac_cv_prog_ac_ct_AR="ar"

17866

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17867

break 2

17868

@@ -8668,7 +8261,7 @@

17868

@@ -8678,7 +8271,7 @@

17869

IFS=$as_save_IFS

17870

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

17871

for ac_exec_ext in '' $ac_executable_extensions; do

17874

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

17875

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17876

break 2

17877

@@ -8708,7 +8301,7 @@

17877

@@ -8718,7 +8311,7 @@

17878

IFS=$as_save_IFS

17879

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

17880

for ac_exec_ext in '' $ac_executable_extensions; do

17883

ac_cv_prog_ac_ct_RANLIB="ranlib"

17884

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17885

break 2

17886

@@ -8764,7 +8357,7 @@

17886

@@ -8774,7 +8367,7 @@

17887

IFS=$as_save_IFS

17888

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

17889

for ac_exec_ext in '' $ac_executable_extensions; do

17892

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

17893

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17894

break 2

17895

@@ -8804,7 +8397,7 @@

17895

@@ -8814,7 +8407,7 @@

17896

IFS=$as_save_IFS

17897

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

17898

for ac_exec_ext in '' $ac_executable_extensions; do

17901

ac_cv_prog_ac_ct_STRIP="strip"

17902

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17903

break 2

17904

@@ -8866,7 +8459,7 @@

17904

@@ -8876,7 +8469,7 @@

17905

test -z "$ac_objext" && ac_objext=o

17906

17907

# Determine commands to create old-style static archives.

17910

old_postinstall_cmds='chmod 644 $oldlib'

17911

old_postuninstall_cmds=

17912

17913

@@ -9066,10 +8659,10 @@

17913

@@ -9076,10 +8669,10 @@

17914

objext=$objext

17915

17916

# Code to be used in simple compile tests

17923

17924

17925

# If no C compiler was specified, use CC.

17926

@@ -9084,13 +8677,13 @@

17926

@@ -9094,13 +8687,13 @@

17927

17928

# save warnings/boilerplate of simple test code

17929

ac_outfile=conftest.$ac_objext

17939

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

17940

_lt_linker_boilerplate=`cat conftest.err`

17941

$rm conftest*

17942

@@ -9110,7 +8703,7 @@

17942

@@ -9120,7 +8713,7 @@

17943

else

17944

lt_cv_prog_compiler_rtti_exceptions=no

17945

ac_outfile=conftest.$ac_objext

17948

lt_compiler_flag="-fno-rtti -fno-exceptions"

17949

# Insert the option either (1) after the last *FLAGS variable, or

17950

# (2) before a word containing "conftest.", or (3) at the end.

17951

@@ -9121,11 +8714,11 @@

17951

@@ -9131,11 +8724,11 @@

17952

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

17953

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

17954

-e 's:$: $lt_compiler_flag:'`

17955

- (eval echo "\"\$as_me:9124: $lt_compile\"" >&5)

17956

+ (eval echo "\"\$as_me:8717: $lt_compile\"" >&5)

17955

- (eval echo "\"\$as_me:9134: $lt_compile\"" >&5)

17956

+ (eval echo "\"\$as_me:8727: $lt_compile\"" >&5)

17957

(eval "$lt_compile" 2>conftest.err)

17958

ac_status=$?

17959

cat conftest.err >&5

17960

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

17961

+ echo "$as_me:8721: \$? = $ac_status" >&5

17960

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

17961

+ echo "$as_me:8731: \$? = $ac_status" >&5

17962

if (exit $ac_status) && test -s "$ac_outfile"; then

17963

# The compiler can only warn and ignore the option if not recognized

17964

# So say no if there are warnings other than the usual output.

17965

@@ -9176,13 +8769,15 @@

17965

@@ -9186,13 +8779,15 @@

17966

lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'

17967

;;

17968

17980

lt_prog_compiler_pic='-DDLL_EXPORT'

17981

;;

17982

17983

@@ -9192,7 +8787,7 @@

17983

@@ -9202,7 +8797,7 @@

17984

lt_prog_compiler_pic='-fno-common'

17985

;;

17986

17989

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

17990

# Instead, we relocate shared libraries at runtime.

17991

;;

17992

@@ -9250,7 +8845,7 @@

17992

@@ -9260,7 +8855,7 @@

17993

esac

17994

;;

17995

17998

# This hack is so that the source file can tell whether it is being

17999

# built for inclusion in a dll (and should export symbols for example).

18000

lt_prog_compiler_pic='-DDLL_EXPORT'

18001

@@ -9283,7 +8878,7 @@

18001

@@ -9293,7 +8888,7 @@

18002

lt_prog_compiler_static='-Bstatic'

18003

;;

18004

18007

case $cc_basename in

18008

icc* | ecc*)

18009

lt_prog_compiler_wl='-Wl,'

18010

@@ -9302,6 +8897,22 @@

18010

@@ -9312,6 +8907,22 @@

18011

# All Alpha code is PIC.

18012

lt_prog_compiler_static='-non_shared'

18013

;;

18030

esac

18031

;;

18032

18033

@@ -9311,6 +8922,10 @@

18033

@@ -9321,6 +8932,10 @@

18034

lt_prog_compiler_static='-non_shared'

18035

;;

18036

18041

solaris*)

18042

lt_prog_compiler_pic='-KPIC'

18043

lt_prog_compiler_static='-Bstatic'

18044

@@ -9378,7 +8993,7 @@

18044

@@ -9388,7 +9003,7 @@

18045

else

18046

lt_prog_compiler_pic_works=no

18047

ac_outfile=conftest.$ac_objext

18050

lt_compiler_flag="$lt_prog_compiler_pic -DPIC"

18051

# Insert the option either (1) after the last *FLAGS variable, or

18052

# (2) before a word containing "conftest.", or (3) at the end.

18053

@@ -9389,11 +9004,11 @@

18053

@@ -9399,11 +9014,11 @@

18054

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

18055

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

18056

-e 's:$: $lt_compiler_flag:'`

18057

- (eval echo "\"\$as_me:9392: $lt_compile\"" >&5)

18058

+ (eval echo "\"\$as_me:9007: $lt_compile\"" >&5)

18057

- (eval echo "\"\$as_me:9402: $lt_compile\"" >&5)

18058

+ (eval echo "\"\$as_me:9017: $lt_compile\"" >&5)

18059

(eval "$lt_compile" 2>conftest.err)

18060

ac_status=$?

18061

cat conftest.err >&5

18062

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

18063

+ echo "$as_me:9011: \$? = $ac_status" >&5

18062

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

18063

+ echo "$as_me:9021: \$? = $ac_status" >&5

18064

if (exit $ac_status) && test -s "$ac_outfile"; then

18065

# The compiler can only warn and ignore the option if not recognized

18066

# So say no if there are warnings other than the usual output.

18067

@@ -9442,7 +9057,7 @@

18067

@@ -9452,7 +9067,7 @@

18068

lt_prog_compiler_static_works=no

18069

save_LDFLAGS="$LDFLAGS"

18070

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

18073

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

18074

# The linker can only warn and ignore the option if not recognized

18075

# So say no if there are warnings

18076

@@ -9482,7 +9097,7 @@

18076

@@ -9492,7 +9107,7 @@

18077

mkdir conftest

18078

cd conftest

18079

mkdir out

18082

18083

lt_compiler_flag="-o out/conftest2.$ac_objext"

18084

# Insert the option either (1) after the last *FLAGS variable, or

18085

@@ -9493,11 +9108,11 @@

18085

@@ -9503,11 +9118,11 @@

18086

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

18087

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

18088

-e 's:$: $lt_compiler_flag:'`

18089

- (eval echo "\"\$as_me:9496: $lt_compile\"" >&5)

18090

+ (eval echo "\"\$as_me:9111: $lt_compile\"" >&5)

18089

- (eval echo "\"\$as_me:9506: $lt_compile\"" >&5)

18090

+ (eval echo "\"\$as_me:9121: $lt_compile\"" >&5)

18091

(eval "$lt_compile" 2>out/conftest.err)

18092

ac_status=$?

18093

cat out/conftest.err >&5

18094

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

18095

+ echo "$as_me:9115: \$? = $ac_status" >&5

18094

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

18095

+ echo "$as_me:9125: \$? = $ac_status" >&5

18096

if (exit $ac_status) && test -s out/conftest2.$ac_objext

18097

then

18098

# The compiler can only warn and ignore the option if not recognized

18099

@@ -9689,7 +9304,7 @@

18099

@@ -9699,7 +9314,7 @@

18100

allow_undefined_flag=unsupported

18101

always_export_symbols=no

18102

enable_shared_with_static_runtimes=yes

18105

18106

if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

18107

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

18108

@@ -9707,7 +9322,7 @@

18108

@@ -9717,7 +9332,7 @@

18109

fi

18110

;;

18111

18114

hardcode_direct=no

18115

hardcode_shlibpath_var=no

18116

hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

18117

@@ -9722,7 +9337,7 @@

18117

@@ -9732,7 +9347,7 @@

18118

archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

18119

;;

18120

18123

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

18124

tmp_addflag=

18125

case $cc_basename,$host_cpu in

18126

@@ -9740,20 +9355,30 @@

18126

@@ -9750,20 +9365,30 @@

18127

ifc* | ifort*) # Intel Fortran compiler

18128

tmp_addflag=' -nofor_main' ;;

18129

esac

18157

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

18158

archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

18159

wlarc=

18160

@@ -9905,7 +9530,7 @@

18160

@@ -9915,7 +9540,7 @@

18161

strings "$collect2name" | grep resolve_lib_name >/dev/null

18162

then

18163

# We have reworked collect2

18166

else

18167

# We have old collect2

18168

hardcode_direct=unsupported

18169

@@ -9973,33 +9598,24 @@

18170

rm -f conftest.er1

18171

cat conftest.err >&5

18172

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

18173

- (exit $ac_status); } &&

18174

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

18175

- { (case "(($ac_try" in

18176

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

18177

- *) ac_try_echo=$ac_try;;

18178

-esac

18179

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

18180

- (eval "$ac_try") 2>&5

18181

- ac_status=$?

18182

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

18183

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

18184

- { ac_try='test -s conftest$ac_exeext'

18185

- { (case "(($ac_try" in

18186

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

18187

- *) ac_try_echo=$ac_try;;

18188

-esac

18189

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

18190

- (eval "$ac_try") 2>&5

18191

- ac_status=$?

18192

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

18193

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

18194

-

18195

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18196

-}'`

18197

+ (exit $ac_status); } && {

18198

+ test -z "$ac_c_werror_flag" ||

18199

+ test ! -s conftest.err

18200

+ } && test -s conftest$ac_exeext &&

18201

+ $as_test_x conftest$ac_exeext; then

18202

+

18203

+lt_aix_libpath_sed='

18204

+ /Import File Strings/,/^$/ {

18205

+ /^0/ {

18206

+ s/^0 *$.*$$/\1/

18207

+ p

18208

+ }

18209

+ }'

18210

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18211

# Check for a 64-bit object if we didn't find anything.

18212

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18213

-}'`; fi

18214

+if test -z "$aix_libpath"; then

18215

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18216

+fi

18217

else

18218

echo "$as_me: failed program was:" >&5

18219

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

18220

@@ -10007,7 +9623,7 @@

18221

18222

fi

18223

18224

-rm -f core conftest.err conftest.$ac_objext \

18225

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

18226

conftest$ac_exeext conftest.$ac_ext

18227

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

18228

18229

@@ -10048,33 +9664,24 @@

18230

rm -f conftest.er1

18231

cat conftest.err >&5

18232

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

18233

- (exit $ac_status); } &&

18234

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

18235

- { (case "(($ac_try" in

18236

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

18237

- *) ac_try_echo=$ac_try;;

18238

-esac

18239

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

18240

- (eval "$ac_try") 2>&5

18241

- ac_status=$?

18242

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

18243

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

18244

- { ac_try='test -s conftest$ac_exeext'

18245

- { (case "(($ac_try" in

18246

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

18247

- *) ac_try_echo=$ac_try;;

18248

-esac

18249

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

18250

- (eval "$ac_try") 2>&5

18251

- ac_status=$?

18252

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

18253

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

18254

-

18255

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18256

-}'`

18257

+ (exit $ac_status); } && {

18258

+ test -z "$ac_c_werror_flag" ||

18259

+ test ! -s conftest.err

18260

+ } && test -s conftest$ac_exeext &&

18261

+ $as_test_x conftest$ac_exeext; then

18262

+

18263

+lt_aix_libpath_sed='

18264

+ /Import File Strings/,/^$/ {

18265

+ /^0/ {

18266

+ s/^0 *$.*$$/\1/

18267

+ p

18268

+ }

18269

+ }'

18270

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18271

# Check for a 64-bit object if we didn't find anything.

18272

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18273

-}'`; fi

18274

+if test -z "$aix_libpath"; then

18275

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18276

+fi

18277

else

18278

echo "$as_me: failed program was:" >&5

18279

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

18280

@@ -10082,7 +9689,7 @@

18281

18282

fi

18283

18284

-rm -f core conftest.err conftest.$ac_objext \

18285

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

18286

conftest$ac_exeext conftest.$ac_ext

18287

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

18288

18289

@@ -10128,7 +9735,7 @@

18169

@@ -9983,33 +9608,24 @@

18170

rm -f conftest.er1

18171

cat conftest.err >&5

18172

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

18173

- (exit $ac_status); } &&

18174

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

18175

- { (case "(($ac_try" in

18176

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

18177

- *) ac_try_echo=$ac_try;;

18178

-esac

18179

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

18180

- (eval "$ac_try") 2>&5

18181

- ac_status=$?

18182

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

18183

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

18184

- { ac_try='test -s conftest$ac_exeext'

18185

- { (case "(($ac_try" in

18186

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

18187

- *) ac_try_echo=$ac_try;;

18188

-esac

18189

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

18190

- (eval "$ac_try") 2>&5

18191

- ac_status=$?

18192

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

18193

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

18194

-

18195

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18196

-}'`

18197

+ (exit $ac_status); } && {

18198

+ test -z "$ac_c_werror_flag" ||

18199

+ test ! -s conftest.err

18200

+ } && test -s conftest$ac_exeext &&

18201

+ $as_test_x conftest$ac_exeext; then

18202

+

18203

+lt_aix_libpath_sed='

18204

+ /Import File Strings/,/^$/ {

18205

+ /^0/ {

18206

+ s/^0 *$.*$$/\1/

18207

+ p

18208

+ }

18209

+ }'

18210

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18211

# Check for a 64-bit object if we didn't find anything.

18212

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18213

-}'`; fi

18214

+if test -z "$aix_libpath"; then

18215

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18216

+fi

18217

else

18218

echo "$as_me: failed program was:" >&5

18219

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

18220

@@ -10017,7 +9633,7 @@

18221

18222

fi

18223

18224

-rm -f core conftest.err conftest.$ac_objext \

18225

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

18226

conftest$ac_exeext conftest.$ac_ext

18227

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

18228

18229

@@ -10058,33 +9674,24 @@

18230

rm -f conftest.er1

18231

cat conftest.err >&5

18232

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

18233

- (exit $ac_status); } &&

18234

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

18235

- { (case "(($ac_try" in

18236

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

18237

- *) ac_try_echo=$ac_try;;

18238

-esac

18239

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

18240

- (eval "$ac_try") 2>&5

18241

- ac_status=$?

18242

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

18243

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

18244

- { ac_try='test -s conftest$ac_exeext'

18245

- { (case "(($ac_try" in

18246

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

18247

- *) ac_try_echo=$ac_try;;

18248

-esac

18249

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

18250

- (eval "$ac_try") 2>&5

18251

- ac_status=$?

18252

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

18253

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

18254

-

18255

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18256

-}'`

18257

+ (exit $ac_status); } && {

18258

+ test -z "$ac_c_werror_flag" ||

18259

+ test ! -s conftest.err

18260

+ } && test -s conftest$ac_exeext &&

18261

+ $as_test_x conftest$ac_exeext; then

18262

+

18263

+lt_aix_libpath_sed='

18264

+ /Import File Strings/,/^$/ {

18265

+ /^0/ {

18266

+ s/^0 *$.*$$/\1/

18267

+ p

18268

+ }

18269

+ }'

18270

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18271

# Check for a 64-bit object if we didn't find anything.

18272

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

18273

-}'`; fi

18274

+if test -z "$aix_libpath"; then

18275

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

18276

+fi

18277

else

18278

echo "$as_me: failed program was:" >&5

18279

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

18280

@@ -10092,7 +9699,7 @@

18281

18282

fi

18283

18284

-rm -f core conftest.err conftest.$ac_objext \

18285

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

18286

conftest$ac_exeext conftest.$ac_ext

18287

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

18288

18289

@@ -10138,7 +9745,7 @@

18290

# The linker will automatically build a .lib file if we build a DLL.

18291

old_archive_From_new_cmds='true'

18292

# FIXME: Should let the user specify the lib program.

18295

fix_srcfile_path='`cygpath -w "$srcfile"`'

18296

enable_shared_with_static_runtimes=yes

18297

;;

18298

@@ -10170,10 +9777,10 @@

18298

@@ -10180,10 +9787,10 @@

18299

case $cc_basename in

18300

xlc*)

18301

output_verbose_link_cmd='echo'

18308

module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

18309

;;

18310

*)

18311

@@ -10213,7 +9820,7 @@

18311

@@ -10223,7 +9830,7 @@

18312

;;

18313

18314

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

18317

archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

18318

hardcode_libdir_flag_spec='-R$libdir'

18319

hardcode_direct=yes

18320

@@ -10315,7 +9922,7 @@

18320

@@ -10325,7 +9932,7 @@

18321

link_all_deplibs=yes

18322

;;

18323

18326

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

18327

archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

18328

else

18329

@@ -10335,24 +9942,28 @@

18329

@@ -10345,24 +9952,28 @@

18330

;;

18331

18332

openbsd*)

18372

fi

18373

;;

18374

18375

@@ -10411,17 +10022,16 @@

18375

@@ -10421,17 +10032,16 @@

18376

case $host_os in

18377

solaris2.[0-5] | solaris2.[0-5].*) ;;

18378

*)

18399

esac

18400

link_all_deplibs=yes

18401

;;

18402

@@ -10478,7 +10088,7 @@

18402

@@ -10488,7 +10098,7 @@

18403

fi

18404

;;

18405

18408

no_undefined_flag='${wl}-z,text'

18409

archive_cmds_need_lc=no

18410

hardcode_shlibpath_var=no

18411

@@ -10555,7 +10165,7 @@

18411

@@ -10565,7 +10175,7 @@

18412

{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

18413

echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

18414

$rm conftest*

18417

18418

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

18419

(eval $ac_compile) 2>&5

18420

@@ -10613,17 +10223,55 @@

18420

@@ -10623,17 +10233,55 @@

18421

version_type=none

18422

dynamic_linker="$host_os ld.so"

18423

sys_lib_dlsearch_path_spec="/lib /usr/lib"

18477

else

18478

sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

18479

fi

18480

@@ -10783,12 +10431,8 @@

18480

@@ -10793,12 +10441,8 @@

18481

shlibpath_overrides_runpath=yes

18482

shlibpath_var=DYLD_LIBRARY_PATH

18483

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

18492

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

18493

;;

18494

18495

@@ -10805,18 +10449,6 @@

18495

@@ -10815,18 +10459,6 @@

18496

dynamic_linker=no

18497

;;

18498

18511

freebsd* | dragonfly*)

18512

# DragonFly does not have aout. When/if they implement a new

18513

# versioning mechanism, adjust this.

18514

@@ -10854,7 +10486,7 @@

18514

@@ -10864,7 +10496,7 @@

18515

shlibpath_overrides_runpath=no

18516

hardcode_into_libs=yes

18517

;;

18520

shlibpath_overrides_runpath=yes

18521

hardcode_into_libs=yes

18522

;;

18523

@@ -10917,7 +10549,7 @@

18523

@@ -10927,7 +10559,7 @@

18524

postinstall_cmds='chmod 555 $lib'

18525

;;

18526

18529

version_type=linux

18530

need_lib_prefix=no

18531

need_version=no

18532

@@ -10972,7 +10604,7 @@

18532

@@ -10982,7 +10614,7 @@

18533

;;

18534

18535

# This must be Linux ELF.

18538

version_type=linux

18539

need_lib_prefix=no

18540

need_version=no

18541

@@ -10986,31 +10618,10 @@

18541

@@ -10996,31 +10628,10 @@

18542

# before this can be enabled.

18543

hardcode_into_libs=yes

18544

18546

- libsuff=

18547

- case "$host_cpu" in

18548

- x86_64*|s390x*|powerpc64*)

18549

- echo '#line 10993 "configure"' > conftest.$ac_ext

18549

- echo '#line 11003 "configure"' > conftest.$ac_ext

18550

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

18551

- (eval $ac_compile) 2>&5

18552

- ac_status=$?

18572

fi

18573

18574

# We used to test for /lib/ld.so.1 and disable shared libraries on

18575

@@ -11022,7 +10633,7 @@

18575

@@ -11032,7 +10643,7 @@

18576

dynamic_linker='GNU/Linux ld.so'

18577

;;

18578

18581

version_type=linux

18582

need_lib_prefix=no

18583

need_version=no

18584

@@ -11031,7 +10642,7 @@

18584

@@ -11041,7 +10652,7 @@

18585

shlibpath_var=LD_LIBRARY_PATH

18586

shlibpath_overrides_runpath=no

18587

hardcode_into_libs=yes

18590

;;

18591

18592

netbsd*)

18593

@@ -11115,6 +10726,10 @@

18593

@@ -11125,6 +10736,10 @@

18594

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

18595

;;

18596

18601

solaris*)

18602

version_type=linux

18603

need_lib_prefix=no

18604

@@ -11268,6 +10883,7 @@

18604

@@ -11278,6 +10893,7 @@

18605

darwin*)

18606

if test -n "$STRIP" ; then

18607

striplib="$STRIP -x"

18609

{ echo "$as_me:$LINENO: result: yes" >&5

18610

echo "${ECHO_T}yes" >&6; }

18611

else

18612

@@ -11351,27 +10967,11 @@

18612

@@ -11361,27 +10977,11 @@

18613

rm -f conftest.er1

18614

cat conftest.err >&5

18615

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

18642

ac_cv_lib_dl_dlopen=yes

18643

else

18644

echo "$as_me: failed program was:" >&5

18645

@@ -11380,7 +10980,7 @@

18645

@@ -11390,7 +10990,7 @@

18646

ac_cv_lib_dl_dlopen=no

18647

fi

18648

18651

conftest$ac_exeext conftest.$ac_ext

18652

LIBS=$ac_check_lib_save_LIBS

18653

fi

18654

@@ -11462,27 +11062,11 @@

18654

@@ -11472,27 +11072,11 @@

18655

rm -f conftest.er1

18656

cat conftest.err >&5

18657

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

18684

ac_cv_func_shl_load=yes

18685

else

18686

echo "$as_me: failed program was:" >&5

18687

@@ -11491,7 +11075,7 @@

18687

@@ -11501,7 +11085,7 @@

18688

ac_cv_func_shl_load=no

18689

fi

18690

18693

conftest$ac_exeext conftest.$ac_ext

18694

fi

18695

{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

18696

@@ -11541,27 +11125,11 @@

18696

@@ -11551,27 +11135,11 @@

18697

rm -f conftest.er1

18698

cat conftest.err >&5

18699

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

18726

ac_cv_lib_dld_shl_load=yes

18727

else

18728

echo "$as_me: failed program was:" >&5

18729

@@ -11570,7 +11138,7 @@

18729

@@ -11580,7 +11148,7 @@

18730

ac_cv_lib_dld_shl_load=no

18731

fi

18732

18735

conftest$ac_exeext conftest.$ac_ext

18736

LIBS=$ac_check_lib_save_LIBS

18737

fi

18738

@@ -11642,27 +11210,11 @@

18738

@@ -11652,27 +11220,11 @@

18739

rm -f conftest.er1

18740

cat conftest.err >&5

18741

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

18768

ac_cv_func_dlopen=yes

18769

else

18770

echo "$as_me: failed program was:" >&5

18771

@@ -11671,7 +11223,7 @@

18771

@@ -11681,7 +11233,7 @@

18772

ac_cv_func_dlopen=no

18773

fi

18774

18777

conftest$ac_exeext conftest.$ac_ext

18778

fi

18779

{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

18780

@@ -11721,27 +11273,11 @@

18780

@@ -11731,27 +11283,11 @@

18781

rm -f conftest.er1

18782

cat conftest.err >&5

18783

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

18810

ac_cv_lib_dl_dlopen=yes

18811

else

18812

echo "$as_me: failed program was:" >&5

18813

@@ -11750,7 +11286,7 @@

18813

@@ -11760,7 +11296,7 @@

18814

ac_cv_lib_dl_dlopen=no

18815

fi

18816

18819

conftest$ac_exeext conftest.$ac_ext

18820

LIBS=$ac_check_lib_save_LIBS

18821

fi

18822

@@ -11801,27 +11337,11 @@

18822

@@ -11811,27 +11347,11 @@

18823

rm -f conftest.er1

18824

cat conftest.err >&5

18825

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

18852

ac_cv_lib_svld_dlopen=yes

18853

else

18854

echo "$as_me: failed program was:" >&5

18855

@@ -11830,7 +11350,7 @@

18855

@@ -11840,7 +11360,7 @@

18856

ac_cv_lib_svld_dlopen=no

18857

fi

18858

18861

conftest$ac_exeext conftest.$ac_ext

18862

LIBS=$ac_check_lib_save_LIBS

18863

fi

18864

@@ -11881,27 +11401,11 @@

18864

@@ -11891,27 +11411,11 @@

18865

rm -f conftest.er1

18866

cat conftest.err >&5

18867

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

18894

ac_cv_lib_dld_dld_link=yes

18895

else

18896

echo "$as_me: failed program was:" >&5

18897

@@ -11910,7 +11414,7 @@

18897

@@ -11920,7 +11424,7 @@

18898

ac_cv_lib_dld_dld_link=no

18899

fi

18900

18903

conftest$ac_exeext conftest.$ac_ext

18904

LIBS=$ac_check_lib_save_LIBS

18905

fi

18906

@@ -11966,7 +11470,7 @@

18907

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

18908

lt_status=$lt_dlunknown

18909

cat > conftest.$ac_ext <<EOF

18910

-#line 11969 "configure"

18911

+#line 11473 "configure"

18912

#include "confdefs.h"

18913

18914

#if HAVE_DLFCN_H

18915

@@ -12066,7 +11570,7 @@

18916

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

18917

lt_status=$lt_dlunknown

18918

cat > conftest.$ac_ext <<EOF

18919

-#line 12069 "configure"

18920

+#line 11573 "configure"

18921

#include "confdefs.h"

18922

18923

#if HAVE_DLFCN_H

18924

@@ -12264,6 +11768,7 @@

18906

@@ -11976,7 +11480,7 @@

18907

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

18908

lt_status=$lt_dlunknown

18909

cat > conftest.$ac_ext <<EOF

18910

-#line 11979 "configure"

18911

+#line 11483 "configure"

18912

#include "confdefs.h"

18913

18914

#if HAVE_DLFCN_H

18915

@@ -12076,7 +11580,7 @@

18916

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

18917

lt_status=$lt_dlunknown

18918

cat > conftest.$ac_ext <<EOF

18919

-#line 12079 "configure"

18920

+#line 11583 "configure"

18921

#include "confdefs.h"

18922

18923

#if HAVE_DLFCN_H

18924

@@ -12274,6 +11778,7 @@

18925

module_cmds \

18926

module_expsym_cmds \

18927

lt_cv_prog_compiler_c_o \

18929

exclude_expsyms \

18930

include_expsyms; do

18931

18932

@@ -12308,7 +11813,7 @@

18932

@@ -12318,7 +11823,7 @@

18933

# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)

18934

# NOTE: Changes made to this file will be lost: look at ltmain.sh.

18935

#

18938

# Free Software Foundation, Inc.

18939

#

18940

# This file is part of GNU Libtool:

18941

@@ -12632,7 +12137,7 @@

18941

@@ -12642,7 +12147,7 @@

18942

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

18943

18944

# Fix the shell variable \$srcfile for the compiler.

18947

18948

# Set to yes if exported symbols are required.

18949

always_export_symbols=$always_export_symbols

18950

@@ -12801,10 +12306,10 @@

18950

@@ -12811,10 +12316,10 @@

18951

objext_CXX=$objext

18952

18953

# Code to be used in simple compile tests

18960

18961

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

18962

18963

@@ -12820,13 +12325,13 @@

18963

@@ -12830,13 +12335,13 @@

18964

18965

# save warnings/boilerplate of simple test code

18966

ac_outfile=conftest.$ac_objext

18976

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

18977

_lt_linker_boilerplate=`cat conftest.err`

18978

$rm conftest*

18979

@@ -13085,7 +12590,7 @@

18979

@@ -13095,7 +12600,7 @@

18980

strings "$collect2name" | grep resolve_lib_name >/dev/null

18981

then

18982

# We have reworked collect2

18985

else

18986

# We have old collect2

18987

hardcode_direct_CXX=unsupported

18988

@@ -13153,33 +12658,24 @@

18989

rm -f conftest.er1

18990

cat conftest.err >&5

18991

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

18992

- (exit $ac_status); } &&

18993

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

18994

- { (case "(($ac_try" in

18995

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

18996

- *) ac_try_echo=$ac_try;;

18997

-esac

18998

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

18999

- (eval "$ac_try") 2>&5

19000

- ac_status=$?

19001

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

19002

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

19003

- { ac_try='test -s conftest$ac_exeext'

19004

- { (case "(($ac_try" in

19005

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

19006

- *) ac_try_echo=$ac_try;;

19007

-esac

19008

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

19009

- (eval "$ac_try") 2>&5

19010

- ac_status=$?

19011

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

19012

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

19013

-

19014

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19015

-}'`

19016

+ (exit $ac_status); } && {

19017

+ test -z "$ac_cxx_werror_flag" ||

19018

+ test ! -s conftest.err

19019

+ } && test -s conftest$ac_exeext &&

19020

+ $as_test_x conftest$ac_exeext; then

19021

+

19022

+lt_aix_libpath_sed='

19023

+ /Import File Strings/,/^$/ {

19024

+ /^0/ {

19025

+ s/^0 *$.*$$/\1/

19026

+ p

19027

+ }

19028

+ }'

19029

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19030

# Check for a 64-bit object if we didn't find anything.

19031

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19032

-}'`; fi

19033

+if test -z "$aix_libpath"; then

19034

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19035

+fi

19036

else

19037

echo "$as_me: failed program was:" >&5

19038

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

19039

@@ -13187,7 +12683,7 @@

19040

19041

fi

19042

19043

-rm -f core conftest.err conftest.$ac_objext \

19044

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19045

conftest$ac_exeext conftest.$ac_ext

19046

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19047

19048

@@ -13229,33 +12725,24 @@

19049

rm -f conftest.er1

19050

cat conftest.err >&5

19051

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

19052

- (exit $ac_status); } &&

19053

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

19054

- { (case "(($ac_try" in

19055

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

19056

- *) ac_try_echo=$ac_try;;

19057

-esac

19058

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

19059

- (eval "$ac_try") 2>&5

19060

- ac_status=$?

19061

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

19062

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

19063

- { ac_try='test -s conftest$ac_exeext'

19064

- { (case "(($ac_try" in

19065

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

19066

- *) ac_try_echo=$ac_try;;

19067

-esac

19068

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

19069

- (eval "$ac_try") 2>&5

19070

- ac_status=$?

19071

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

19072

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

19073

-

19074

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19075

-}'`

19076

+ (exit $ac_status); } && {

19077

+ test -z "$ac_cxx_werror_flag" ||

19078

+ test ! -s conftest.err

19079

+ } && test -s conftest$ac_exeext &&

19080

+ $as_test_x conftest$ac_exeext; then

19081

+

19082

+lt_aix_libpath_sed='

19083

+ /Import File Strings/,/^$/ {

19084

+ /^0/ {

19085

+ s/^0 *$.*$$/\1/

19086

+ p

19087

+ }

19088

+ }'

19089

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19090

# Check for a 64-bit object if we didn't find anything.

19091

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19092

-}'`; fi

19093

+if test -z "$aix_libpath"; then

19094

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19095

+fi

19096

else

19097

echo "$as_me: failed program was:" >&5

19098

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

19099

@@ -13263,7 +12750,7 @@

19100

19101

fi

19102

19103

-rm -f core conftest.err conftest.$ac_objext \

19104

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19105

conftest$ac_exeext conftest.$ac_ext

19106

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19107

19108

@@ -13374,10 +12861,10 @@

18988

@@ -13163,33 +12668,24 @@

18989

rm -f conftest.er1

18990

cat conftest.err >&5

18991

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

18992

- (exit $ac_status); } &&

18993

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

18994

- { (case "(($ac_try" in

18995

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

18996

- *) ac_try_echo=$ac_try;;

18997

-esac

18998

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

18999

- (eval "$ac_try") 2>&5

19000

- ac_status=$?

19001

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

19002

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

19003

- { ac_try='test -s conftest$ac_exeext'

19004

- { (case "(($ac_try" in

19005

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

19006

- *) ac_try_echo=$ac_try;;

19007

-esac

19008

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

19009

- (eval "$ac_try") 2>&5

19010

- ac_status=$?

19011

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

19012

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

19013

-

19014

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19015

-}'`

19016

+ (exit $ac_status); } && {

19017

+ test -z "$ac_cxx_werror_flag" ||

19018

+ test ! -s conftest.err

19019

+ } && test -s conftest$ac_exeext &&

19020

+ $as_test_x conftest$ac_exeext; then

19021

+

19022

+lt_aix_libpath_sed='

19023

+ /Import File Strings/,/^$/ {

19024

+ /^0/ {

19025

+ s/^0 *$.*$$/\1/

19026

+ p

19027

+ }

19028

+ }'

19029

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19030

# Check for a 64-bit object if we didn't find anything.

19031

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19032

-}'`; fi

19033

+if test -z "$aix_libpath"; then

19034

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19035

+fi

19036

else

19037

echo "$as_me: failed program was:" >&5

19038

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

19039

@@ -13197,7 +12693,7 @@

19040

19041

fi

19042

19043

-rm -f core conftest.err conftest.$ac_objext \

19044

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19045

conftest$ac_exeext conftest.$ac_ext

19046

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19047

19048

@@ -13239,33 +12735,24 @@

19049

rm -f conftest.er1

19050

cat conftest.err >&5

19051

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

19052

- (exit $ac_status); } &&

19053

- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

19054

- { (case "(($ac_try" in

19055

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

19056

- *) ac_try_echo=$ac_try;;

19057

-esac

19058

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

19059

- (eval "$ac_try") 2>&5

19060

- ac_status=$?

19061

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

19062

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

19063

- { ac_try='test -s conftest$ac_exeext'

19064

- { (case "(($ac_try" in

19065

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

19066

- *) ac_try_echo=$ac_try;;

19067

-esac

19068

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

19069

- (eval "$ac_try") 2>&5

19070

- ac_status=$?

19071

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

19072

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

19073

-

19074

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19075

-}'`

19076

+ (exit $ac_status); } && {

19077

+ test -z "$ac_cxx_werror_flag" ||

19078

+ test ! -s conftest.err

19079

+ } && test -s conftest$ac_exeext &&

19080

+ $as_test_x conftest$ac_exeext; then

19081

+

19082

+lt_aix_libpath_sed='

19083

+ /Import File Strings/,/^$/ {

19084

+ /^0/ {

19085

+ s/^0 *$.*$$/\1/

19086

+ p

19087

+ }

19088

+ }'

19089

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19090

# Check for a 64-bit object if we didn't find anything.

19091

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19092

-}'`; fi

19093

+if test -z "$aix_libpath"; then

19094

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19095

+fi

19096

else

19097

echo "$as_me: failed program was:" >&5

19098

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

19099

@@ -13273,7 +12760,7 @@

19100

19101

fi

19102

19103

-rm -f core conftest.err conftest.$ac_objext \

19104

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19105

conftest$ac_exeext conftest.$ac_ext

19106

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19107

19108

@@ -13384,10 +12871,10 @@

19109

case $cc_basename in

19110

xlc*)

19111

output_verbose_link_cmd='echo'

19118

module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

19119

;;

19120

*)

19121

@@ -13411,7 +12898,7 @@

19121

@@ -13421,7 +12908,7 @@

19122

freebsd-elf*)

19123

archive_cmds_need_lc_CXX=no

19124

;;

19127

# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF

19128

# conventions

19129

ld_shlibs_CXX=yes

19130

@@ -13460,9 +12947,7 @@

19130

@@ -13470,9 +12957,7 @@

19131

hardcode_libdir_separator_CXX=:

19132

19133

case $host_cpu in

19138

*)

19139

export_dynamic_flag_spec_CXX='${wl}-E'

19140

;;

19141

@@ -13530,7 +13015,7 @@

19141

@@ -13540,7 +13025,7 @@

19142

;;

19143

esac

19144

;;

19147

hardcode_direct_CXX=no

19148

hardcode_shlibpath_var_CXX=no

19149

hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'

19150

@@ -13570,7 +13055,7 @@

19150

@@ -13580,7 +13065,7 @@

19151

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

19152

hardcode_libdir_separator_CXX=:

19153

;;

19156

case $cc_basename in

19157

KCC*)

19158

# Kuck and Associates, Inc. (KAI) C++ Compiler

19159

@@ -13650,6 +13135,29 @@

19159

@@ -13660,6 +13145,29 @@

19160

# dependencies.

19161

output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'

19162

;;

19186

esac

19187

;;

19188

lynxos*)

19189

@@ -13672,7 +13180,7 @@

19189

@@ -13682,7 +13190,7 @@

19190

;;

19191

esac

19192

;;

19195

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

19196

archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

19197

wlarc=

19198

@@ -13688,16 +13196,20 @@

19198

@@ -13698,16 +13206,20 @@

19199

ld_shlibs_CXX=no

19200

;;

19201

openbsd*)

19225

;;

19226

osf3*)

19227

case $cc_basename in

19228

@@ -13859,15 +13371,10 @@

19228

@@ -13869,15 +13381,10 @@

19229

case $host_os in

19230

solaris2.[0-5] | solaris2.[0-5].*) ;;

19231

*)

19244

;;

19245

esac

19246

link_all_deplibs_CXX=yes

19247

@@ -13914,6 +13421,12 @@

19247

@@ -13924,6 +13431,12 @@

19248

fi

19249

19250

hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'

19257

fi

19258

;;

19259

esac

19260

@@ -14105,7 +13618,7 @@

19260

@@ -14115,7 +13628,7 @@

19261

19262

# PORTME: override above test on systems where it is broken

19263

case $host_os in

19266

# Interix 3.5 installs completely hosed .la files for C++, so rather than

19267

# hack all around it, let's just trust "g++" to DTRT.

19268

predep_objects_CXX=

19269

@@ -14113,13 +13626,46 @@

19269

@@ -14123,13 +13636,46 @@

19270

postdeps_CXX=

19271

;;

19272

19314

;;

19315

esac

19316

;;

19317

@@ -14156,12 +13702,14 @@

19317

@@ -14166,12 +13712,14 @@

19318

# like `-m68040'.

19319

lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'

19320

;;

19331

lt_prog_compiler_pic_CXX='-DDLL_EXPORT'

19332

;;

19333

darwin* | rhapsody*)

19334

@@ -14173,7 +13721,7 @@

19334

@@ -14183,7 +13731,7 @@

19335

# DJGPP does not support shared libraries at all

19336

lt_prog_compiler_pic_CXX=

19337

;;

19340

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

19341

# Instead, we relocate shared libraries at runtime.

19342

;;

19343

@@ -14239,7 +13787,7 @@

19343

@@ -14249,7 +13797,7 @@

19344

;;

19345

esac

19346

;;

19349

# FreeBSD uses GNU C++

19350

;;

19351

hpux9* | hpux10* | hpux11*)

19352

@@ -14282,7 +13830,7 @@

19352

@@ -14292,7 +13840,7 @@

19353

;;

19354

esac

19355

;;

19358

case $cc_basename in

19359

KCC*)

19360

# KAI C++ Compiler

19361

@@ -14309,6 +13857,14 @@

19361

@@ -14319,6 +13867,14 @@

19362

lt_prog_compiler_static_CXX='-non_shared'

19363

;;

19364

*)

19373

;;

19374

esac

19375

;;

19376

@@ -14325,7 +13881,7 @@

19376

@@ -14335,7 +13891,7 @@

19377

;;

19378

esac

19379

;;

19382

;;

19383

osf3* | osf4* | osf5*)

19384

case $cc_basename in

19385

@@ -14423,7 +13979,7 @@

19385

@@ -14433,7 +13989,7 @@

19386

else

19387

lt_prog_compiler_pic_works_CXX=no

19388

ac_outfile=conftest.$ac_objext

19391

lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"

19392

# Insert the option either (1) after the last *FLAGS variable, or

19393

# (2) before a word containing "conftest.", or (3) at the end.

19394

@@ -14434,11 +13990,11 @@

19394

@@ -14444,11 +14000,11 @@

19395

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

19396

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

19397

-e 's:$: $lt_compiler_flag:'`

19398

- (eval echo "\"\$as_me:14437: $lt_compile\"" >&5)

19399

+ (eval echo "\"\$as_me:13993: $lt_compile\"" >&5)

19398

- (eval echo "\"\$as_me:14447: $lt_compile\"" >&5)

19399

+ (eval echo "\"\$as_me:14003: $lt_compile\"" >&5)

19400

(eval "$lt_compile" 2>conftest.err)

19401

ac_status=$?

19402

cat conftest.err >&5

19403

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

19404

+ echo "$as_me:13997: \$? = $ac_status" >&5

19403

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

19404

+ echo "$as_me:14007: \$? = $ac_status" >&5

19405

if (exit $ac_status) && test -s "$ac_outfile"; then

19406

# The compiler can only warn and ignore the option if not recognized

19407

# So say no if there are warnings other than the usual output.

19408

@@ -14487,7 +14043,7 @@

19408

@@ -14497,7 +14053,7 @@

19409

lt_prog_compiler_static_works_CXX=no

19410

save_LDFLAGS="$LDFLAGS"

19411

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

19414

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

19415

# The linker can only warn and ignore the option if not recognized

19416

# So say no if there are warnings

19417

@@ -14527,7 +14083,7 @@

19417

@@ -14537,7 +14093,7 @@

19418

mkdir conftest

19419

cd conftest

19420

mkdir out

19423

19424

lt_compiler_flag="-o out/conftest2.$ac_objext"

19425

# Insert the option either (1) after the last *FLAGS variable, or

19426

@@ -14538,11 +14094,11 @@

19426

@@ -14548,11 +14104,11 @@

19427

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

19428

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

19429

-e 's:$: $lt_compiler_flag:'`

19430

- (eval echo "\"\$as_me:14541: $lt_compile\"" >&5)

19431

+ (eval echo "\"\$as_me:14097: $lt_compile\"" >&5)

19430

- (eval echo "\"\$as_me:14551: $lt_compile\"" >&5)

19431

+ (eval echo "\"\$as_me:14107: $lt_compile\"" >&5)

19432

(eval "$lt_compile" 2>out/conftest.err)

19433

ac_status=$?

19434

cat out/conftest.err >&5

19435

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

19436

+ echo "$as_me:14101: \$? = $ac_status" >&5

19435

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

19436

+ echo "$as_me:14111: \$? = $ac_status" >&5

19437

if (exit $ac_status) && test -s out/conftest2.$ac_objext

19438

then

19439

# The compiler can only warn and ignore the option if not recognized

19440

@@ -14608,7 +14164,10 @@

19440

@@ -14618,7 +14174,10 @@

19441

export_symbols_cmds_CXX="$ltdll_cmds"

19442

;;

19443

cygwin* | mingw*)

19449

;;

19450

*)

19451

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

19452

@@ -14639,7 +14198,7 @@

19452

@@ -14649,7 +14208,7 @@

19453

{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

19454

echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

19455

$rm conftest*

19458

19459

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

19460

(eval $ac_compile) 2>&5

19461

@@ -14697,20 +14256,7 @@

19461

@@ -14707,20 +14266,7 @@

19462

version_type=none

19463

dynamic_linker="$host_os ld.so"

19464

sys_lib_dlsearch_path_spec="/lib /usr/lib"

19480

need_lib_prefix=unknown

19481

hardcode_into_libs=no

19482

19483

@@ -14867,12 +14413,7 @@

19483

@@ -14877,12 +14423,7 @@

19484

shlibpath_overrides_runpath=yes

19485

shlibpath_var=DYLD_LIBRARY_PATH

19486

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

19494

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

19495

;;

19496

19497

@@ -14889,18 +14430,6 @@

19497

@@ -14899,18 +14440,6 @@

19498

dynamic_linker=no

19499

;;

19500

19513

freebsd* | dragonfly*)

19514

# DragonFly does not have aout. When/if they implement a new

19515

# versioning mechanism, adjust this.

19516

@@ -14938,7 +14467,7 @@

19516

@@ -14948,7 +14477,7 @@

19517

shlibpath_overrides_runpath=no

19518

hardcode_into_libs=yes

19519

;;

19522

shlibpath_overrides_runpath=yes

19523

hardcode_into_libs=yes

19524

;;

19525

@@ -15001,7 +14530,7 @@

19525

@@ -15011,7 +14540,7 @@

19526

postinstall_cmds='chmod 555 $lib'

19527

;;

19528

19531

version_type=linux

19532

need_lib_prefix=no

19533

need_version=no

19534

@@ -15056,7 +14585,7 @@

19534

@@ -15066,7 +14595,7 @@

19535

;;

19536

19537

# This must be Linux ELF.

19540

version_type=linux

19541

need_lib_prefix=no

19542

need_version=no

19543

@@ -15070,31 +14599,10 @@

19543

@@ -15080,31 +14609,10 @@

19544

# before this can be enabled.

19545

hardcode_into_libs=yes

19546

19548

- libsuff=

19549

- case "$host_cpu" in

19550

- x86_64*|s390x*|powerpc64*)

19551

- echo '#line 15077 "configure"' > conftest.$ac_ext

19551

- echo '#line 15087 "configure"' > conftest.$ac_ext

19552

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

19553

- (eval $ac_compile) 2>&5

19554

- ac_status=$?

19574

fi

19575

19576

# We used to test for /lib/ld.so.1 and disable shared libraries on

19577

@@ -15106,7 +14614,7 @@

19577

@@ -15116,7 +14624,7 @@

19578

dynamic_linker='GNU/Linux ld.so'

19579

;;

19580

19583

version_type=linux

19584

need_lib_prefix=no

19585

need_version=no

19586

@@ -15115,7 +14623,7 @@

19586

@@ -15125,7 +14633,7 @@

19587

shlibpath_var=LD_LIBRARY_PATH

19588

shlibpath_overrides_runpath=no

19589

hardcode_into_libs=yes

19592

;;

19593

19594

netbsd*)

19595

@@ -15199,6 +14707,10 @@

19595

@@ -15209,6 +14717,10 @@

19596

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

19597

;;

19598

19603

solaris*)

19604

version_type=linux

19605

need_lib_prefix=no

19606

@@ -15393,6 +14905,7 @@

19606

@@ -15403,6 +14915,7 @@

19607

module_cmds_CXX \

19608

module_expsym_cmds_CXX \

19609

lt_cv_prog_compiler_c_o_CXX \

19611

exclude_expsyms_CXX \

19612

include_expsyms_CXX; do

19613

19614

@@ -15713,7 +15226,7 @@

19614

@@ -15723,7 +15236,7 @@

19615

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

19616

19617

# Fix the shell variable \$srcfile for the compiler.

19620

19621

# Set to yes if exported symbols are required.

19622

always_export_symbols=$always_export_symbols_CXX

19623

@@ -15804,10 +15317,17 @@

19623

@@ -15814,10 +15327,17 @@

19624

objext_F77=$objext

19625

19626

# Code to be used in simple compile tests

19640

19641

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

19642

19643

@@ -15823,13 +15343,13 @@

19643

@@ -15833,13 +15353,13 @@

19644

19645

# save warnings/boilerplate of simple test code

19646

ac_outfile=conftest.$ac_objext

19656

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

19657

_lt_linker_boilerplate=`cat conftest.err`

19658

$rm conftest*

19659

@@ -15916,13 +15436,15 @@

19659

@@ -15926,13 +15446,15 @@

19660

lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'

19661

;;

19662

19674

lt_prog_compiler_pic_F77='-DDLL_EXPORT'

19675

;;

19676

19677

@@ -15932,7 +15454,7 @@

19677

@@ -15942,7 +15464,7 @@

19678

lt_prog_compiler_pic_F77='-fno-common'

19679

;;

19680

19683

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

19684

# Instead, we relocate shared libraries at runtime.

19685

;;

19686

@@ -15990,7 +15512,7 @@

19686

@@ -16000,7 +15522,7 @@

19687

esac

19688

;;

19689

19692

# This hack is so that the source file can tell whether it is being

19693

# built for inclusion in a dll (and should export symbols for example).

19694

lt_prog_compiler_pic_F77='-DDLL_EXPORT'

19695

@@ -16023,7 +15545,7 @@

19695

@@ -16033,7 +15555,7 @@

19696

lt_prog_compiler_static_F77='-Bstatic'

19697

;;

19698

19701

case $cc_basename in

19702

icc* | ecc*)

19703

lt_prog_compiler_wl_F77='-Wl,'

19704

@@ -16042,6 +15564,22 @@

19704

@@ -16052,6 +15574,22 @@

19705

# All Alpha code is PIC.

19706

lt_prog_compiler_static_F77='-non_shared'

19707

;;

19724

esac

19725

;;

19726

19727

@@ -16051,6 +15589,10 @@

19727

@@ -16061,6 +15599,10 @@

19728

lt_prog_compiler_static_F77='-non_shared'

19729

;;

19730

19735

solaris*)

19736

lt_prog_compiler_pic_F77='-KPIC'

19737

lt_prog_compiler_static_F77='-Bstatic'

19738

@@ -16118,7 +15660,7 @@

19738

@@ -16128,7 +15670,7 @@

19739

else

19740

lt_prog_compiler_pic_works_F77=no

19741

ac_outfile=conftest.$ac_objext

19744

lt_compiler_flag="$lt_prog_compiler_pic_F77"

19745

# Insert the option either (1) after the last *FLAGS variable, or

19746

# (2) before a word containing "conftest.", or (3) at the end.

19747

@@ -16129,11 +15671,11 @@

19747

@@ -16139,11 +15681,11 @@

19748

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

19749

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

19750

-e 's:$: $lt_compiler_flag:'`

19751

- (eval echo "\"\$as_me:16132: $lt_compile\"" >&5)

19752

+ (eval echo "\"\$as_me:15674: $lt_compile\"" >&5)

19751

- (eval echo "\"\$as_me:16142: $lt_compile\"" >&5)

19752

+ (eval echo "\"\$as_me:15684: $lt_compile\"" >&5)

19753

(eval "$lt_compile" 2>conftest.err)

19754

ac_status=$?

19755

cat conftest.err >&5

19756

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

19757

+ echo "$as_me:15678: \$? = $ac_status" >&5

19756

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

19757

+ echo "$as_me:15688: \$? = $ac_status" >&5

19758

if (exit $ac_status) && test -s "$ac_outfile"; then

19759

# The compiler can only warn and ignore the option if not recognized

19760

# So say no if there are warnings other than the usual output.

19761

@@ -16182,7 +15724,7 @@

19761

@@ -16192,7 +15734,7 @@

19762

lt_prog_compiler_static_works_F77=no

19763

save_LDFLAGS="$LDFLAGS"

19764

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

19767

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

19768

# The linker can only warn and ignore the option if not recognized

19769

# So say no if there are warnings

19770

@@ -16222,7 +15764,7 @@

19770

@@ -16232,7 +15774,7 @@

19771

mkdir conftest

19772

cd conftest

19773

mkdir out

19776

19777

lt_compiler_flag="-o out/conftest2.$ac_objext"

19778

# Insert the option either (1) after the last *FLAGS variable, or

19779

@@ -16233,11 +15775,11 @@

19779

@@ -16243,11 +15785,11 @@

19780

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

19781

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

19782

-e 's:$: $lt_compiler_flag:'`

19783

- (eval echo "\"\$as_me:16236: $lt_compile\"" >&5)

19784

+ (eval echo "\"\$as_me:15778: $lt_compile\"" >&5)

19783

- (eval echo "\"\$as_me:16246: $lt_compile\"" >&5)

19784

+ (eval echo "\"\$as_me:15788: $lt_compile\"" >&5)

19785

(eval "$lt_compile" 2>out/conftest.err)

19786

ac_status=$?

19787

cat out/conftest.err >&5

19788

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

19789

+ echo "$as_me:15782: \$? = $ac_status" >&5

19788

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

19789

+ echo "$as_me:15792: \$? = $ac_status" >&5

19790

if (exit $ac_status) && test -s out/conftest2.$ac_objext

19791

then

19792

# The compiler can only warn and ignore the option if not recognized

19793

@@ -16429,7 +15971,7 @@

19793

@@ -16439,7 +15981,7 @@

19794

allow_undefined_flag_F77=unsupported

19795

always_export_symbols_F77=no

19796

enable_shared_with_static_runtimes_F77=yes

19799

19800

if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

19801

archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

19802

@@ -16447,7 +15989,7 @@

19802

@@ -16457,7 +15999,7 @@

19803

fi

19804

;;

19805

19808

hardcode_direct_F77=no

19809

hardcode_shlibpath_var_F77=no

19810

hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'

19811

@@ -16462,7 +16004,7 @@

19811

@@ -16472,7 +16014,7 @@

19812

archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

19813

;;

19814

19817

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

19818

tmp_addflag=

19819

case $cc_basename,$host_cpu in

19820

@@ -16480,20 +16022,30 @@

19820

@@ -16490,20 +16032,30 @@

19821

ifc* | ifort*) # Intel Fortran compiler

19822

tmp_addflag=' -nofor_main' ;;

19823

esac

19851

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

19852

archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

19853

wlarc=

19854

@@ -16645,7 +16197,7 @@

19854

@@ -16655,7 +16207,7 @@

19855

strings "$collect2name" | grep resolve_lib_name >/dev/null

19856

then

19857

# We have reworked collect2

19860

else

19861

# We have old collect2

19862

hardcode_direct_F77=unsupported

19863

@@ -16703,33 +16255,24 @@

19864

rm -f conftest.er1

19865

cat conftest.err >&5

19866

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

19867

- (exit $ac_status); } &&

19868

- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

19869

- { (case "(($ac_try" in

19870

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

19871

- *) ac_try_echo=$ac_try;;

19872

-esac

19873

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

19874

- (eval "$ac_try") 2>&5

19875

- ac_status=$?

19876

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

19877

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

19878

- { ac_try='test -s conftest$ac_exeext'

19879

- { (case "(($ac_try" in

19880

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

19881

- *) ac_try_echo=$ac_try;;

19882

-esac

19883

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

19884

- (eval "$ac_try") 2>&5

19885

- ac_status=$?

19886

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

19887

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

19888

-

19889

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19890

-}'`

19891

+ (exit $ac_status); } && {

19892

+ test -z "$ac_f77_werror_flag" ||

19893

+ test ! -s conftest.err

19894

+ } && test -s conftest$ac_exeext &&

19895

+ $as_test_x conftest$ac_exeext; then

19896

+

19897

+lt_aix_libpath_sed='

19898

+ /Import File Strings/,/^$/ {

19899

+ /^0/ {

19900

+ s/^0 *$.*$$/\1/

19901

+ p

19902

+ }

19903

+ }'

19904

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19905

# Check for a 64-bit object if we didn't find anything.

19906

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19907

-}'`; fi

19908

+if test -z "$aix_libpath"; then

19909

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19910

+fi

19911

else

19912

echo "$as_me: failed program was:" >&5

19913

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

19914

@@ -16737,7 +16280,7 @@

19915

19916

fi

19917

19918

-rm -f core conftest.err conftest.$ac_objext \

19919

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19920

conftest$ac_exeext conftest.$ac_ext

19921

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19922

19923

@@ -16768,33 +16311,24 @@

19924

rm -f conftest.er1

19925

cat conftest.err >&5

19926

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

19927

- (exit $ac_status); } &&

19928

- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

19929

- { (case "(($ac_try" in

19930

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

19931

- *) ac_try_echo=$ac_try;;

19932

-esac

19933

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

19934

- (eval "$ac_try") 2>&5

19935

- ac_status=$?

19936

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

19937

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

19938

- { ac_try='test -s conftest$ac_exeext'

19939

- { (case "(($ac_try" in

19940

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

19941

- *) ac_try_echo=$ac_try;;

19942

-esac

19943

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

19944

- (eval "$ac_try") 2>&5

19945

- ac_status=$?

19946

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

19947

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

19948

-

19949

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19950

-}'`

19951

+ (exit $ac_status); } && {

19952

+ test -z "$ac_f77_werror_flag" ||

19953

+ test ! -s conftest.err

19954

+ } && test -s conftest$ac_exeext &&

19955

+ $as_test_x conftest$ac_exeext; then

19956

+

19957

+lt_aix_libpath_sed='

19958

+ /Import File Strings/,/^$/ {

19959

+ /^0/ {

19960

+ s/^0 *$.*$$/\1/

19961

+ p

19962

+ }

19963

+ }'

19964

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19965

# Check for a 64-bit object if we didn't find anything.

19966

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19967

-}'`; fi

19968

+if test -z "$aix_libpath"; then

19969

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19970

+fi

19971

else

19972

echo "$as_me: failed program was:" >&5

19973

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

19974

@@ -16802,7 +16336,7 @@

19975

19976

fi

19977

19978

-rm -f core conftest.err conftest.$ac_objext \

19979

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19980

conftest$ac_exeext conftest.$ac_ext

19981

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19982

19983

@@ -16848,7 +16382,7 @@

19863

@@ -16713,33 +16265,24 @@

19864

rm -f conftest.er1

19865

cat conftest.err >&5

19866

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

19867

- (exit $ac_status); } &&

19868

- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

19869

- { (case "(($ac_try" in

19870

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

19871

- *) ac_try_echo=$ac_try;;

19872

-esac

19873

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

19874

- (eval "$ac_try") 2>&5

19875

- ac_status=$?

19876

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

19877

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

19878

- { ac_try='test -s conftest$ac_exeext'

19879

- { (case "(($ac_try" in

19880

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

19881

- *) ac_try_echo=$ac_try;;

19882

-esac

19883

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

19884

- (eval "$ac_try") 2>&5

19885

- ac_status=$?

19886

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

19887

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

19888

-

19889

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19890

-}'`

19891

+ (exit $ac_status); } && {

19892

+ test -z "$ac_f77_werror_flag" ||

19893

+ test ! -s conftest.err

19894

+ } && test -s conftest$ac_exeext &&

19895

+ $as_test_x conftest$ac_exeext; then

19896

+

19897

+lt_aix_libpath_sed='

19898

+ /Import File Strings/,/^$/ {

19899

+ /^0/ {

19900

+ s/^0 *$.*$$/\1/

19901

+ p

19902

+ }

19903

+ }'

19904

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19905

# Check for a 64-bit object if we didn't find anything.

19906

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19907

-}'`; fi

19908

+if test -z "$aix_libpath"; then

19909

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19910

+fi

19911

else

19912

echo "$as_me: failed program was:" >&5

19913

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

19914

@@ -16747,7 +16290,7 @@

19915

19916

fi

19917

19918

-rm -f core conftest.err conftest.$ac_objext \

19919

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19920

conftest$ac_exeext conftest.$ac_ext

19921

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19922

19923

@@ -16778,33 +16321,24 @@

19924

rm -f conftest.er1

19925

cat conftest.err >&5

19926

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

19927

- (exit $ac_status); } &&

19928

- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

19929

- { (case "(($ac_try" in

19930

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

19931

- *) ac_try_echo=$ac_try;;

19932

-esac

19933

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

19934

- (eval "$ac_try") 2>&5

19935

- ac_status=$?

19936

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

19937

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

19938

- { ac_try='test -s conftest$ac_exeext'

19939

- { (case "(($ac_try" in

19940

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

19941

- *) ac_try_echo=$ac_try;;

19942

-esac

19943

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

19944

- (eval "$ac_try") 2>&5

19945

- ac_status=$?

19946

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

19947

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

19948

-

19949

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19950

-}'`

19951

+ (exit $ac_status); } && {

19952

+ test -z "$ac_f77_werror_flag" ||

19953

+ test ! -s conftest.err

19954

+ } && test -s conftest$ac_exeext &&

19955

+ $as_test_x conftest$ac_exeext; then

19956

+

19957

+lt_aix_libpath_sed='

19958

+ /Import File Strings/,/^$/ {

19959

+ /^0/ {

19960

+ s/^0 *$.*$$/\1/

19961

+ p

19962

+ }

19963

+ }'

19964

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19965

# Check for a 64-bit object if we didn't find anything.

19966

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

19967

-}'`; fi

19968

+if test -z "$aix_libpath"; then

19969

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19970

+fi

19971

else

19972

echo "$as_me: failed program was:" >&5

19973

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

19974

@@ -16812,7 +16346,7 @@

19975

19976

fi

19977

19978

-rm -f core conftest.err conftest.$ac_objext \

19979

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19980

conftest$ac_exeext conftest.$ac_ext

19981

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19982

19983

@@ -16858,7 +16392,7 @@

19984

# The linker will automatically build a .lib file if we build a DLL.

19985

old_archive_From_new_cmds_F77='true'

19986

# FIXME: Should let the user specify the lib program.

19989

fix_srcfile_path_F77='`cygpath -w "$srcfile"`'

19990

enable_shared_with_static_runtimes_F77=yes

19991

;;

19992

@@ -16890,10 +16424,10 @@

19992

@@ -16900,10 +16434,10 @@

19993

case $cc_basename in

19994

xlc*)

19995

output_verbose_link_cmd='echo'

20002

module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

20003

;;

20004

*)

20005

@@ -16933,7 +16467,7 @@

20005

@@ -16943,7 +16477,7 @@

20006

;;

20007

20008

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

20011

archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

20012

hardcode_libdir_flag_spec_F77='-R$libdir'

20013

hardcode_direct_F77=yes

20014

@@ -17035,7 +16569,7 @@

20014

@@ -17045,7 +16579,7 @@

20015

link_all_deplibs_F77=yes

20016

;;

20017

20020

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

20021

archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

20022

else

20023

@@ -17055,24 +16589,28 @@

20023

@@ -17065,24 +16599,28 @@

20024

;;

20025

20026

openbsd*)

20066

fi

20067

;;

20068

20069

@@ -17131,17 +16669,16 @@

20069

@@ -17141,17 +16679,16 @@

20070

case $host_os in

20071

solaris2.[0-5] | solaris2.[0-5].*) ;;

20072

*)

20093

esac

20094

link_all_deplibs_F77=yes

20095

;;

20096

@@ -17198,7 +16735,7 @@

20096

@@ -17208,7 +16745,7 @@

20097

fi

20098

;;

20099

20102

no_undefined_flag_F77='${wl}-z,text'

20103

archive_cmds_need_lc_F77=no

20104

hardcode_shlibpath_var_F77=no

20105

@@ -17275,7 +16812,7 @@

20105

@@ -17285,7 +16822,7 @@

20106

{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

20107

echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

20108

$rm conftest*

20111

20112

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

20113

(eval $ac_compile) 2>&5

20114

@@ -17333,20 +16870,7 @@

20114

@@ -17343,20 +16880,7 @@

20115

version_type=none

20116

dynamic_linker="$host_os ld.so"

20117

sys_lib_dlsearch_path_spec="/lib /usr/lib"

20133

need_lib_prefix=unknown

20134

hardcode_into_libs=no

20135

20136

@@ -17503,12 +17027,7 @@

20136

@@ -17513,12 +17037,7 @@

20137

shlibpath_overrides_runpath=yes

20138

shlibpath_var=DYLD_LIBRARY_PATH

20139

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

20147

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

20148

;;

20149

20150

@@ -17525,18 +17044,6 @@

20150

@@ -17535,18 +17054,6 @@

20151

dynamic_linker=no

20152

;;

20153

20166

freebsd* | dragonfly*)

20167

# DragonFly does not have aout. When/if they implement a new

20168

# versioning mechanism, adjust this.

20169

@@ -17574,7 +17081,7 @@

20169

@@ -17584,7 +17091,7 @@

20170

shlibpath_overrides_runpath=no

20171

hardcode_into_libs=yes

20172

;;

20175

shlibpath_overrides_runpath=yes

20176

hardcode_into_libs=yes

20177

;;

20178

@@ -17637,7 +17144,7 @@

20178

@@ -17647,7 +17154,7 @@

20179

postinstall_cmds='chmod 555 $lib'

20180

;;

20181

20184

version_type=linux

20185

need_lib_prefix=no

20186

need_version=no

20187

@@ -17692,7 +17199,7 @@

20187

@@ -17702,7 +17209,7 @@

20188

;;

20189

20190

# This must be Linux ELF.

20193

version_type=linux

20194

need_lib_prefix=no

20195

need_version=no

20196

@@ -17706,31 +17213,10 @@

20196

@@ -17716,31 +17223,10 @@

20197

# before this can be enabled.

20198

hardcode_into_libs=yes

20199

20201

- libsuff=

20202

- case "$host_cpu" in

20203

- x86_64*|s390x*|powerpc64*)

20204

- echo '#line 17713 "configure"' > conftest.$ac_ext

20204

- echo '#line 17723 "configure"' > conftest.$ac_ext

20205

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

20206

- (eval $ac_compile) 2>&5

20207

- ac_status=$?

20227

fi

20228

20229

# We used to test for /lib/ld.so.1 and disable shared libraries on

20230

@@ -17742,7 +17228,7 @@

20230

@@ -17752,7 +17238,7 @@

20231

dynamic_linker='GNU/Linux ld.so'

20232

;;

20233

20236

version_type=linux

20237

need_lib_prefix=no

20238

need_version=no

20239

@@ -17751,7 +17237,7 @@

20239

@@ -17761,7 +17247,7 @@

20240

shlibpath_var=LD_LIBRARY_PATH

20241

shlibpath_overrides_runpath=no

20242

hardcode_into_libs=yes

20245

;;

20246

20247

netbsd*)

20248

@@ -17835,6 +17321,10 @@

20248

@@ -17845,6 +17331,10 @@

20249

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

20250

;;

20251

20256

solaris*)

20257

version_type=linux

20258

need_lib_prefix=no

20259

@@ -18029,6 +17519,7 @@

20259

@@ -18039,6 +17529,7 @@

20260

module_cmds_F77 \

20261

module_expsym_cmds_F77 \

20262

lt_cv_prog_compiler_c_o_F77 \

20264

exclude_expsyms_F77 \

20265

include_expsyms_F77; do

20266

20267

@@ -18349,7 +17840,7 @@

20267

@@ -18359,7 +17850,7 @@

20268

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

20269

20270

# Fix the shell variable \$srcfile for the compiler.

20273

20274

# Set to yes if exported symbols are required.

20275

always_export_symbols=$always_export_symbols_F77

20276

@@ -18407,10 +17898,10 @@

20276

@@ -18417,10 +17908,10 @@

20277

objext_GCJ=$objext

20278

20279

# Code to be used in simple compile tests

20286

20287

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

20288

20289

@@ -18426,13 +17917,13 @@

20289

@@ -18436,13 +17927,13 @@

20290

20291

# save warnings/boilerplate of simple test code

20292

ac_outfile=conftest.$ac_objext

20302

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

20303

_lt_linker_boilerplate=`cat conftest.err`

20304

$rm conftest*

20305

@@ -18473,7 +17964,7 @@

20305

@@ -18483,7 +17974,7 @@

20306

else

20307

lt_cv_prog_compiler_rtti_exceptions=no

20308

ac_outfile=conftest.$ac_objext

20311

lt_compiler_flag="-fno-rtti -fno-exceptions"

20312

# Insert the option either (1) after the last *FLAGS variable, or

20313

# (2) before a word containing "conftest.", or (3) at the end.

20314

@@ -18484,11 +17975,11 @@

20314

@@ -18494,11 +17985,11 @@

20315

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

20316

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

20317

-e 's:$: $lt_compiler_flag:'`

20318

- (eval echo "\"\$as_me:18487: $lt_compile\"" >&5)

20319

+ (eval echo "\"\$as_me:17978: $lt_compile\"" >&5)

20318

- (eval echo "\"\$as_me:18497: $lt_compile\"" >&5)

20319

+ (eval echo "\"\$as_me:17988: $lt_compile\"" >&5)

20320

(eval "$lt_compile" 2>conftest.err)

20321

ac_status=$?

20322

cat conftest.err >&5

20323

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

20324

+ echo "$as_me:17982: \$? = $ac_status" >&5

20323

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

20324

+ echo "$as_me:17992: \$? = $ac_status" >&5

20325

if (exit $ac_status) && test -s "$ac_outfile"; then

20326

# The compiler can only warn and ignore the option if not recognized

20327

# So say no if there are warnings other than the usual output.

20328

@@ -18539,13 +18030,15 @@

20328

@@ -18549,13 +18040,15 @@

20329

lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'

20330

;;

20331

20343

lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'

20344

;;

20345

20346

@@ -18555,7 +18048,7 @@

20346

@@ -18565,7 +18058,7 @@

20347

lt_prog_compiler_pic_GCJ='-fno-common'

20348

;;

20349

20352

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

20353

# Instead, we relocate shared libraries at runtime.

20354

;;

20355

@@ -18613,7 +18106,7 @@

20355

@@ -18623,7 +18116,7 @@

20356

esac

20357

;;

20358

20361

# This hack is so that the source file can tell whether it is being

20362

# built for inclusion in a dll (and should export symbols for example).

20363

lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'

20364

@@ -18646,7 +18139,7 @@

20364

@@ -18656,7 +18149,7 @@

20365

lt_prog_compiler_static_GCJ='-Bstatic'

20366

;;

20367

20370

case $cc_basename in

20371

icc* | ecc*)

20372

lt_prog_compiler_wl_GCJ='-Wl,'

20373

@@ -18665,6 +18158,22 @@

20373

@@ -18675,6 +18168,22 @@

20374

# All Alpha code is PIC.

20375

lt_prog_compiler_static_GCJ='-non_shared'

20376

;;

20393

esac

20394

;;

20395

20396

@@ -18674,6 +18183,10 @@

20396

@@ -18684,6 +18193,10 @@

20397

lt_prog_compiler_static_GCJ='-non_shared'

20398

;;

20399

20404

solaris*)

20405

lt_prog_compiler_pic_GCJ='-KPIC'

20406

lt_prog_compiler_static_GCJ='-Bstatic'

20407

@@ -18741,7 +18254,7 @@

20407

@@ -18751,7 +18264,7 @@

20408

else

20409

lt_prog_compiler_pic_works_GCJ=no

20410

ac_outfile=conftest.$ac_objext

20413

lt_compiler_flag="$lt_prog_compiler_pic_GCJ"

20414

# Insert the option either (1) after the last *FLAGS variable, or

20415

# (2) before a word containing "conftest.", or (3) at the end.

20416

@@ -18752,11 +18265,11 @@

20416

@@ -18762,11 +18275,11 @@

20417

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

20418

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

20419

-e 's:$: $lt_compiler_flag:'`

20420

- (eval echo "\"\$as_me:18755: $lt_compile\"" >&5)

20421

+ (eval echo "\"\$as_me:18268: $lt_compile\"" >&5)

20420

- (eval echo "\"\$as_me:18765: $lt_compile\"" >&5)

20421

+ (eval echo "\"\$as_me:18278: $lt_compile\"" >&5)

20422

(eval "$lt_compile" 2>conftest.err)

20423

ac_status=$?

20424

cat conftest.err >&5

20425

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

20426

+ echo "$as_me:18272: \$? = $ac_status" >&5

20425

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

20426

+ echo "$as_me:18282: \$? = $ac_status" >&5

20427

if (exit $ac_status) && test -s "$ac_outfile"; then

20428

# The compiler can only warn and ignore the option if not recognized

20429

# So say no if there are warnings other than the usual output.

20430

@@ -18805,7 +18318,7 @@

20430

@@ -18815,7 +18328,7 @@

20431

lt_prog_compiler_static_works_GCJ=no

20432

save_LDFLAGS="$LDFLAGS"

20433

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

20436

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

20437

# The linker can only warn and ignore the option if not recognized

20438

# So say no if there are warnings

20439

@@ -18845,7 +18358,7 @@

20439

@@ -18855,7 +18368,7 @@

20440

mkdir conftest

20441

cd conftest

20442

mkdir out

20445

20446

lt_compiler_flag="-o out/conftest2.$ac_objext"

20447

# Insert the option either (1) after the last *FLAGS variable, or

20448

@@ -18856,11 +18369,11 @@

20448

@@ -18866,11 +18379,11 @@

20449

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

20450

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

20451

-e 's:$: $lt_compiler_flag:'`

20452

- (eval echo "\"\$as_me:18859: $lt_compile\"" >&5)

20453

+ (eval echo "\"\$as_me:18372: $lt_compile\"" >&5)

20452

- (eval echo "\"\$as_me:18869: $lt_compile\"" >&5)

20453

+ (eval echo "\"\$as_me:18382: $lt_compile\"" >&5)

20454

(eval "$lt_compile" 2>out/conftest.err)

20455

ac_status=$?

20456

cat out/conftest.err >&5

20457

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

20458

+ echo "$as_me:18376: \$? = $ac_status" >&5

20457

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

20458

+ echo "$as_me:18386: \$? = $ac_status" >&5

20459

if (exit $ac_status) && test -s out/conftest2.$ac_objext

20460

then

20461

# The compiler can only warn and ignore the option if not recognized

20462

@@ -19052,7 +18565,7 @@

20462

@@ -19062,7 +18575,7 @@

20463

allow_undefined_flag_GCJ=unsupported

20464

always_export_symbols_GCJ=no

20465

enable_shared_with_static_runtimes_GCJ=yes

20468

20469

if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

20470

archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

20471

@@ -19070,7 +18583,7 @@

20471

@@ -19080,7 +18593,7 @@

20472

fi

20473

;;

20474

20477

hardcode_direct_GCJ=no

20478

hardcode_shlibpath_var_GCJ=no

20479

hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'

20480

@@ -19085,7 +18598,7 @@

20480

@@ -19095,7 +18608,7 @@

20481

archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

20482

;;

20483

20486

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

20487

tmp_addflag=

20488

case $cc_basename,$host_cpu in

20489

@@ -19103,20 +18616,30 @@

20489

@@ -19113,20 +18626,30 @@

20490

ifc* | ifort*) # Intel Fortran compiler

20491

tmp_addflag=' -nofor_main' ;;

20492

esac

20520

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

20521

archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

20522

wlarc=

20523

@@ -19268,7 +18791,7 @@

20523

@@ -19278,7 +18801,7 @@

20524

strings "$collect2name" | grep resolve_lib_name >/dev/null

20525

then

20526

# We have reworked collect2

20529

else

20530

# We have old collect2

20531

hardcode_direct_GCJ=unsupported

20532

@@ -19336,33 +18859,24 @@

20533

rm -f conftest.er1

20534

cat conftest.err >&5

20535

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

20536

- (exit $ac_status); } &&

20537

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

20538

- { (case "(($ac_try" in

20539

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

20540

- *) ac_try_echo=$ac_try;;

20541

-esac

20542

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

20543

- (eval "$ac_try") 2>&5

20544

- ac_status=$?

20545

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

20546

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

20547

- { ac_try='test -s conftest$ac_exeext'

20548

- { (case "(($ac_try" in

20549

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

20550

- *) ac_try_echo=$ac_try;;

20551

-esac

20552

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

20553

- (eval "$ac_try") 2>&5

20554

- ac_status=$?

20555

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

20556

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

20557

-

20558

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20559

-}'`

20560

+ (exit $ac_status); } && {

20561

+ test -z "$ac_c_werror_flag" ||

20562

+ test ! -s conftest.err

20563

+ } && test -s conftest$ac_exeext &&

20564

+ $as_test_x conftest$ac_exeext; then

20565

+

20566

+lt_aix_libpath_sed='

20567

+ /Import File Strings/,/^$/ {

20568

+ /^0/ {

20569

+ s/^0 *$.*$$/\1/

20570

+ p

20571

+ }

20572

+ }'

20573

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20574

# Check for a 64-bit object if we didn't find anything.

20575

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20576

-}'`; fi

20577

+if test -z "$aix_libpath"; then

20578

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20579

+fi

20580

else

20581

echo "$as_me: failed program was:" >&5

20582

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

20583

@@ -19370,7 +18884,7 @@

20584

20585

fi

20586

20587

-rm -f core conftest.err conftest.$ac_objext \

20588

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20589

conftest$ac_exeext conftest.$ac_ext

20590

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

20591

20592

@@ -19411,33 +18925,24 @@

20593

rm -f conftest.er1

20594

cat conftest.err >&5

20595

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

20596

- (exit $ac_status); } &&

20597

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

20598

- { (case "(($ac_try" in

20599

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

20600

- *) ac_try_echo=$ac_try;;

20601

-esac

20602

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

20603

- (eval "$ac_try") 2>&5

20604

- ac_status=$?

20605

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

20606

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

20607

- { ac_try='test -s conftest$ac_exeext'

20608

- { (case "(($ac_try" in

20609

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

20610

- *) ac_try_echo=$ac_try;;

20611

-esac

20612

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

20613

- (eval "$ac_try") 2>&5

20614

- ac_status=$?

20615

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

20616

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

20617

-

20618

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20619

-}'`

20620

+ (exit $ac_status); } && {

20621

+ test -z "$ac_c_werror_flag" ||

20622

+ test ! -s conftest.err

20623

+ } && test -s conftest$ac_exeext &&

20624

+ $as_test_x conftest$ac_exeext; then

20625

+

20626

+lt_aix_libpath_sed='

20627

+ /Import File Strings/,/^$/ {

20628

+ /^0/ {

20629

+ s/^0 *$.*$$/\1/

20630

+ p

20631

+ }

20632

+ }'

20633

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20634

# Check for a 64-bit object if we didn't find anything.

20635

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20636

-}'`; fi

20637

+if test -z "$aix_libpath"; then

20638

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20639

+fi

20640

else

20641

echo "$as_me: failed program was:" >&5

20642

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

20643

@@ -19445,7 +18950,7 @@

20644

20645

fi

20646

20647

-rm -f core conftest.err conftest.$ac_objext \

20648

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20649

conftest$ac_exeext conftest.$ac_ext

20650

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

20651

20652

@@ -19491,7 +18996,7 @@

20532

@@ -19346,33 +18869,24 @@

20533

rm -f conftest.er1

20534

cat conftest.err >&5

20535

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

20536

- (exit $ac_status); } &&

20537

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

20538

- { (case "(($ac_try" in

20539

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

20540

- *) ac_try_echo=$ac_try;;

20541

-esac

20542

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

20543

- (eval "$ac_try") 2>&5

20544

- ac_status=$?

20545

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

20546

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

20547

- { ac_try='test -s conftest$ac_exeext'

20548

- { (case "(($ac_try" in

20549

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

20550

- *) ac_try_echo=$ac_try;;

20551

-esac

20552

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

20553

- (eval "$ac_try") 2>&5

20554

- ac_status=$?

20555

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

20556

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

20557

-

20558

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20559

-}'`

20560

+ (exit $ac_status); } && {

20561

+ test -z "$ac_c_werror_flag" ||

20562

+ test ! -s conftest.err

20563

+ } && test -s conftest$ac_exeext &&

20564

+ $as_test_x conftest$ac_exeext; then

20565

+

20566

+lt_aix_libpath_sed='

20567

+ /Import File Strings/,/^$/ {

20568

+ /^0/ {

20569

+ s/^0 *$.*$$/\1/

20570

+ p

20571

+ }

20572

+ }'

20573

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20574

# Check for a 64-bit object if we didn't find anything.

20575

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20576

-}'`; fi

20577

+if test -z "$aix_libpath"; then

20578

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20579

+fi

20580

else

20581

echo "$as_me: failed program was:" >&5

20582

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

20583

@@ -19380,7 +18894,7 @@

20584

20585

fi

20586

20587

-rm -f core conftest.err conftest.$ac_objext \

20588

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20589

conftest$ac_exeext conftest.$ac_ext

20590

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

20591

20592

@@ -19421,33 +18935,24 @@

20593

rm -f conftest.er1

20594

cat conftest.err >&5

20595

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

20596

- (exit $ac_status); } &&

20597

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

20598

- { (case "(($ac_try" in

20599

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

20600

- *) ac_try_echo=$ac_try;;

20601

-esac

20602

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

20603

- (eval "$ac_try") 2>&5

20604

- ac_status=$?

20605

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

20606

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

20607

- { ac_try='test -s conftest$ac_exeext'

20608

- { (case "(($ac_try" in

20609

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

20610

- *) ac_try_echo=$ac_try;;

20611

-esac

20612

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

20613

- (eval "$ac_try") 2>&5

20614

- ac_status=$?

20615

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

20616

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

20617

-

20618

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20619

-}'`

20620

+ (exit $ac_status); } && {

20621

+ test -z "$ac_c_werror_flag" ||

20622

+ test ! -s conftest.err

20623

+ } && test -s conftest$ac_exeext &&

20624

+ $as_test_x conftest$ac_exeext; then

20625

+

20626

+lt_aix_libpath_sed='

20627

+ /Import File Strings/,/^$/ {

20628

+ /^0/ {

20629

+ s/^0 *$.*$$/\1/

20630

+ p

20631

+ }

20632

+ }'

20633

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20634

# Check for a 64-bit object if we didn't find anything.

20635

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

20636

-}'`; fi

20637

+if test -z "$aix_libpath"; then

20638

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

20639

+fi

20640

else

20641

echo "$as_me: failed program was:" >&5

20642

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

20643

@@ -19455,7 +18960,7 @@

20644

20645

fi

20646

20647

-rm -f core conftest.err conftest.$ac_objext \

20648

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20649

conftest$ac_exeext conftest.$ac_ext

20650

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

20651

20652

@@ -19501,7 +19006,7 @@

20653

# The linker will automatically build a .lib file if we build a DLL.

20654

old_archive_From_new_cmds_GCJ='true'

20655

# FIXME: Should let the user specify the lib program.

20658

fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'

20659

enable_shared_with_static_runtimes_GCJ=yes

20660

;;

20661

@@ -19533,10 +19038,10 @@

20661

@@ -19543,10 +19048,10 @@

20662

case $cc_basename in

20663

xlc*)

20664

output_verbose_link_cmd='echo'

20671

module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

20672

;;

20673

*)

20674

@@ -19576,7 +19081,7 @@

20674

@@ -19586,7 +19091,7 @@

20675

;;

20676

20677

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

20680

archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

20681

hardcode_libdir_flag_spec_GCJ='-R$libdir'

20682

hardcode_direct_GCJ=yes

20683

@@ -19678,7 +19183,7 @@

20683

@@ -19688,7 +19193,7 @@

20684

link_all_deplibs_GCJ=yes

20685

;;

20686

20689

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

20690

archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

20691

else

20692

@@ -19698,24 +19203,28 @@

20692

@@ -19708,24 +19213,28 @@

20693

;;

20694

20695

openbsd*)

20735

fi

20736

;;

20737

20738

@@ -19774,17 +19283,16 @@

20738

@@ -19784,17 +19293,16 @@

20739

case $host_os in

20740

solaris2.[0-5] | solaris2.[0-5].*) ;;

20741

*)

20762

esac

20763

link_all_deplibs_GCJ=yes

20764

;;

20765

@@ -19841,7 +19349,7 @@

20765

@@ -19851,7 +19359,7 @@

20766

fi

20767

;;

20768

20771

no_undefined_flag_GCJ='${wl}-z,text'

20772

archive_cmds_need_lc_GCJ=no

20773

hardcode_shlibpath_var_GCJ=no

20774

@@ -19918,7 +19426,7 @@

20774

@@ -19928,7 +19436,7 @@

20775

{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

20776

echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

20777

$rm conftest*

20780

20781

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

20782

(eval $ac_compile) 2>&5

20783

@@ -19976,20 +19484,7 @@

20783

@@ -19986,20 +19494,7 @@

20784

version_type=none

20785

dynamic_linker="$host_os ld.so"

20786

sys_lib_dlsearch_path_spec="/lib /usr/lib"

20802

need_lib_prefix=unknown

20803

hardcode_into_libs=no

20804

20805

@@ -20146,12 +19641,7 @@

20805

@@ -20156,12 +19651,7 @@

20806

shlibpath_overrides_runpath=yes

20807

shlibpath_var=DYLD_LIBRARY_PATH

20808

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

20816

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

20817

;;

20818

20819

@@ -20168,18 +19658,6 @@

20819

@@ -20178,18 +19668,6 @@

20820

dynamic_linker=no

20821

;;

20822

20835

freebsd* | dragonfly*)

20836

# DragonFly does not have aout. When/if they implement a new

20837

# versioning mechanism, adjust this.

20838

@@ -20217,7 +19695,7 @@

20838

@@ -20227,7 +19705,7 @@

20839

shlibpath_overrides_runpath=no

20840

hardcode_into_libs=yes

20841

;;

20844

shlibpath_overrides_runpath=yes

20845

hardcode_into_libs=yes

20846

;;

20847

@@ -20280,7 +19758,7 @@

20847

@@ -20290,7 +19768,7 @@

20848

postinstall_cmds='chmod 555 $lib'

20849

;;

20850

20853

version_type=linux

20854

need_lib_prefix=no

20855

need_version=no

20856

@@ -20335,7 +19813,7 @@

20856

@@ -20345,7 +19823,7 @@

20857

;;

20858

20859

# This must be Linux ELF.

20862

version_type=linux

20863

need_lib_prefix=no

20864

need_version=no

20865

@@ -20349,31 +19827,10 @@

20865

@@ -20359,31 +19837,10 @@

20866

# before this can be enabled.

20867

hardcode_into_libs=yes

20868

20870

- libsuff=

20871

- case "$host_cpu" in

20872

- x86_64*|s390x*|powerpc64*)

20873

- echo '#line 20356 "configure"' > conftest.$ac_ext

20873

- echo '#line 20366 "configure"' > conftest.$ac_ext

20874

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

20875

- (eval $ac_compile) 2>&5

20876

- ac_status=$?

20896

fi

20897

20898

# We used to test for /lib/ld.so.1 and disable shared libraries on

20899

@@ -20385,7 +19842,7 @@

20899

@@ -20395,7 +19852,7 @@

20900

dynamic_linker='GNU/Linux ld.so'

20901

;;

20902

20905

version_type=linux

20906

need_lib_prefix=no

20907

need_version=no

20908

@@ -20394,7 +19851,7 @@

20908

@@ -20404,7 +19861,7 @@

20909

shlibpath_var=LD_LIBRARY_PATH

20910

shlibpath_overrides_runpath=no

20911

hardcode_into_libs=yes

20914

;;

20915

20916

netbsd*)

20917

@@ -20478,6 +19935,10 @@

20917

@@ -20488,6 +19945,10 @@

20918

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

20919

;;

20920

20925

solaris*)

20926

version_type=linux

20927

need_lib_prefix=no

20928

@@ -20672,6 +20133,7 @@

20928

@@ -20682,6 +20143,7 @@

20929

module_cmds_GCJ \

20930

module_expsym_cmds_GCJ \

20931

lt_cv_prog_compiler_c_o_GCJ \

20933

exclude_expsyms_GCJ \

20934

include_expsyms_GCJ; do

20935

20936

@@ -20992,7 +20454,7 @@

20936

@@ -21002,7 +20464,7 @@

20937

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

20938

20939

# Fix the shell variable \$srcfile for the compiler.

20942

20943

# Set to yes if exported symbols are required.

20944

always_export_symbols=$always_export_symbols_GCJ

20945

@@ -21049,7 +20511,7 @@

20945

@@ -21059,7 +20521,7 @@

20946

objext_RC=$objext

20947

20948

# Code to be used in simple compile tests

20951

20952

# Code to be used in simple link tests

20953

lt_simple_link_test_code="$lt_simple_compile_test_code"

20954

@@ -21068,13 +20530,13 @@

20954

@@ -21078,13 +20540,13 @@

20955

20956

# save warnings/boilerplate of simple test code

20957

ac_outfile=conftest.$ac_objext

20967

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

20968

_lt_linker_boilerplate=`cat conftest.err`

20969

$rm conftest*

20970

@@ -21152,6 +20614,7 @@

20970

@@ -21162,6 +20624,7 @@

20971

module_cmds_RC \

20972

module_expsym_cmds_RC \

20973

lt_cv_prog_compiler_c_o_RC \

20975

exclude_expsyms_RC \

20976

include_expsyms_RC; do

20977

20978

@@ -21472,7 +20935,7 @@

20978

@@ -21482,7 +20945,7 @@

20979

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

20980

20981

# Fix the shell variable \$srcfile for the compiler.

20984

20985

# Set to yes if exported symbols are required.

20986

always_export_symbols=$always_export_symbols_RC

20987

@@ -21693,17 +21156,10 @@

20987

@@ -21703,17 +21166,10 @@

20988

rm -f conftest.er1

20989

cat conftest.err >&5

20990

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

21006

# We can compile using X headers with no special include directory.

21007

ac_x_includes=

21008

else

21009

@@ -21726,7 +21182,7 @@

21009

@@ -21736,7 +21192,7 @@

21010

# See if we find them without any special options.

21011

# Don't add to $LIBS permanently.

21012

ac_save_LIBS=$LIBS

21015

cat >conftest.$ac_ext <<_ACEOF

21016

/* confdefs.h. */

21017

_ACEOF

21018

@@ -21755,27 +21211,11 @@

21018

@@ -21765,27 +21221,11 @@

21019

rm -f conftest.er1

21020

cat conftest.err >&5

21021

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

21048

LIBS=$ac_save_LIBS

21049

# We can link X programs with no special library path.

21050

ac_x_libraries=

21051

@@ -21788,7 +21228,7 @@

21051

@@ -21798,7 +21238,7 @@

21052

do

21053

# Don't even attempt the hair of trying to link an X program!

21054

for ac_extension in a so sl; do

21057

ac_x_libraries=$ac_dir

21058

break 2

21059

fi

21060

@@ -21796,7 +21236,7 @@

21060

@@ -21806,7 +21246,7 @@

21061

done

21062

fi

21063

21066

conftest$ac_exeext conftest.$ac_ext

21067

fi # $ac_x_libraries = no

21068

21069

@@ -21851,12 +21291,12 @@

21069

@@ -21861,12 +21301,12 @@

21070

X_LIBS="$X_LIBS -L$x_libraries"

21071

# For Solaris; some versions of Sun CC require a space after -R and

21072

# others require no space. Words are not sufficient . . . .

21084

/* confdefs.h. */

21085

_ACEOF

21086

cat confdefs.h >>conftest.$ac_ext

21087

@@ -21884,44 +21324,20 @@

21087

@@ -21894,44 +21334,20 @@

21088

rm -f conftest.er1

21089

cat conftest.err >&5

21090

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

21138

/* confdefs.h. */

21139

_ACEOF

21140

cat confdefs.h >>conftest.$ac_ext

21141

@@ -21949,48 +21365,30 @@

21141

@@ -21959,48 +21375,30 @@

21142

rm -f conftest.er1

21143

cat conftest.err >&5

21144

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

21204

fi

21205

21206

# Check for system-dependent libraries X programs must link with.

21207

@@ -22039,27 +21437,11 @@

21207

@@ -22049,27 +21447,11 @@

21208

rm -f conftest.er1

21209

cat conftest.err >&5

21210

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

21237

:

21238

else

21239

echo "$as_me: failed program was:" >&5

21240

@@ -22107,27 +21489,11 @@

21240

@@ -22117,27 +21499,11 @@

21241

rm -f conftest.er1

21242

cat conftest.err >&5

21243

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

21270

ac_cv_lib_dnet_dnet_ntoa=yes

21271

else

21272

echo "$as_me: failed program was:" >&5

21273

@@ -22136,7 +21502,7 @@

21273

@@ -22146,7 +21512,7 @@

21274

ac_cv_lib_dnet_dnet_ntoa=no

21275

fi

21276

21279

conftest$ac_exeext conftest.$ac_ext

21280

LIBS=$ac_check_lib_save_LIBS

21281

fi

21282

@@ -22189,27 +21555,11 @@

21282

@@ -22199,27 +21565,11 @@

21283

rm -f conftest.er1

21284

cat conftest.err >&5

21285

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

21312

ac_cv_lib_dnet_stub_dnet_ntoa=yes

21313

else

21314

echo "$as_me: failed program was:" >&5

21315

@@ -22218,7 +21568,7 @@

21315

@@ -22228,7 +21578,7 @@

21316

ac_cv_lib_dnet_stub_dnet_ntoa=no

21317

fi

21318

21321

conftest$ac_exeext conftest.$ac_ext

21322

LIBS=$ac_check_lib_save_LIBS

21323

fi

21324

@@ -22231,7 +21581,7 @@

21324

@@ -22241,7 +21591,7 @@

21325

fi

21326

fi

21327

21330

conftest$ac_exeext conftest.$ac_ext

21331

LIBS="$ac_xsave_LIBS"

21332

21333

@@ -22306,27 +21656,11 @@

21333

@@ -22316,27 +21666,11 @@

21334

rm -f conftest.er1

21335

cat conftest.err >&5

21336

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

21363

ac_cv_func_gethostbyname=yes

21364

else

21365

echo "$as_me: failed program was:" >&5

21366

@@ -22335,7 +21669,7 @@

21366

@@ -22345,7 +21679,7 @@

21367

ac_cv_func_gethostbyname=no

21368

fi

21369

21372

conftest$ac_exeext conftest.$ac_ext

21373

fi

21374

{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

21375

@@ -22384,27 +21718,11 @@

21375

@@ -22394,27 +21728,11 @@

21376

rm -f conftest.er1

21377

cat conftest.err >&5

21378

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

21405

ac_cv_lib_nsl_gethostbyname=yes

21406

else

21407

echo "$as_me: failed program was:" >&5

21408

@@ -22413,7 +21731,7 @@

21408

@@ -22423,7 +21741,7 @@

21409

ac_cv_lib_nsl_gethostbyname=no

21410

fi

21411

21414

conftest$ac_exeext conftest.$ac_ext

21415

LIBS=$ac_check_lib_save_LIBS

21416

fi

21417

@@ -22466,27 +21784,11 @@

21417

@@ -22476,27 +21794,11 @@

21418

rm -f conftest.er1

21419

cat conftest.err >&5

21420

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

21447

ac_cv_lib_bsd_gethostbyname=yes

21448

else

21449

echo "$as_me: failed program was:" >&5

21450

@@ -22495,7 +21797,7 @@

21450

@@ -22505,7 +21807,7 @@

21451

ac_cv_lib_bsd_gethostbyname=no

21452

fi

21453

21456

conftest$ac_exeext conftest.$ac_ext

21457

LIBS=$ac_check_lib_save_LIBS

21458

fi

21459

@@ -22578,27 +21880,11 @@

21459

@@ -22588,27 +21890,11 @@

21460

rm -f conftest.er1

21461

cat conftest.err >&5

21462

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

21489

ac_cv_func_connect=yes

21490

else

21491

echo "$as_me: failed program was:" >&5

21492

@@ -22607,7 +21893,7 @@

21492

@@ -22617,7 +21903,7 @@

21493

ac_cv_func_connect=no

21494

fi

21495

21498

conftest$ac_exeext conftest.$ac_ext

21499

fi

21500

{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

21501

@@ -22656,27 +21942,11 @@

21501

@@ -22666,27 +21952,11 @@

21502

rm -f conftest.er1

21503

cat conftest.err >&5

21504

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

21531

ac_cv_lib_socket_connect=yes

21532

else

21533

echo "$as_me: failed program was:" >&5

21534

@@ -22685,7 +21955,7 @@

21534

@@ -22695,7 +21965,7 @@

21535

ac_cv_lib_socket_connect=no

21536

fi

21537

21540

conftest$ac_exeext conftest.$ac_ext

21541

LIBS=$ac_check_lib_save_LIBS

21542

fi

21543

@@ -22761,27 +22031,11 @@

21543

@@ -22771,27 +22041,11 @@

21544

rm -f conftest.er1

21545

cat conftest.err >&5

21546

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

21573

ac_cv_func_remove=yes

21574

else

21575

echo "$as_me: failed program was:" >&5

21576

@@ -22790,7 +22044,7 @@

21576

@@ -22800,7 +22054,7 @@

21577

ac_cv_func_remove=no

21578

fi

21579

21582

conftest$ac_exeext conftest.$ac_ext

21583

fi

21584

{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5

21585

@@ -22839,27 +22093,11 @@

21585

@@ -22849,27 +22103,11 @@

21586

rm -f conftest.er1

21587

cat conftest.err >&5

21588

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

21615

ac_cv_lib_posix_remove=yes

21616

else

21617

echo "$as_me: failed program was:" >&5

21618

@@ -22868,7 +22106,7 @@

21618

@@ -22878,7 +22116,7 @@

21619

ac_cv_lib_posix_remove=no

21620

fi

21621

21624

conftest$ac_exeext conftest.$ac_ext

21625

LIBS=$ac_check_lib_save_LIBS

21626

fi

21627

@@ -22944,27 +22182,11 @@

21627

@@ -22954,27 +22192,11 @@

21628

rm -f conftest.er1

21629

cat conftest.err >&5

21630

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

21657

ac_cv_func_shmat=yes

21658

else

21659

echo "$as_me: failed program was:" >&5

21660

@@ -22973,7 +22195,7 @@

21660

@@ -22983,7 +22205,7 @@

21661

ac_cv_func_shmat=no

21662

fi

21663

21666

conftest$ac_exeext conftest.$ac_ext

21667

fi

21668

{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5

21669

@@ -23022,27 +22244,11 @@

21669

@@ -23032,27 +22254,11 @@

21670

rm -f conftest.er1

21671

cat conftest.err >&5

21672

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

21699

ac_cv_lib_ipc_shmat=yes

21700

else

21701

echo "$as_me: failed program was:" >&5

21702

@@ -23051,7 +22257,7 @@

21702

@@ -23061,7 +22267,7 @@

21703

ac_cv_lib_ipc_shmat=no

21704

fi

21705

21708

conftest$ac_exeext conftest.$ac_ext

21709

LIBS=$ac_check_lib_save_LIBS

21710

fi

21711

@@ -23115,27 +22321,11 @@

21711

@@ -23125,27 +22331,11 @@

21712

rm -f conftest.er1

21713

cat conftest.err >&5

21714

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

21741

ac_cv_lib_ICE_IceConnectionNumber=yes

21742

else

21743

echo "$as_me: failed program was:" >&5

21744

@@ -23144,7 +22334,7 @@

21744

@@ -23154,7 +22344,7 @@

21745

ac_cv_lib_ICE_IceConnectionNumber=no

21746

fi

21747

21750

conftest$ac_exeext conftest.$ac_ext

21751

LIBS=$ac_check_lib_save_LIBS

21752

fi

21753

@@ -23239,7 +22429,7 @@

21753

@@ -23249,7 +22439,7 @@

21754

IFS=$as_save_IFS

21755

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

21756

for ac_exec_ext in '' $ac_executable_extensions; do

21759

ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"

21760

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

21761

break 2

21762

@@ -23376,17 +22566,10 @@

21762

@@ -23386,17 +22576,10 @@

21763

rm -f conftest.er1

21764

cat conftest.err >&5

21765

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

21781

{ echo "$as_me:$LINENO: result: found" >&5

21782

echo "${ECHO_T}found" >&6; }

21783

HAVE_PYHDRS="yes"

21784

@@ -23470,27 +22653,10 @@

21784

@@ -23480,27 +22663,10 @@

21785

rm -f conftest.er1

21786

cat conftest.err >&5

21787

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

21813

has_option=yes

21814

else

21815

echo "$as_me: failed program was:" >&5

21816

@@ -23596,27 +22762,10 @@

21816

@@ -23606,27 +22772,10 @@

21817

rm -f conftest.er1

21818

cat conftest.err >&5

21819

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

21845

ac_header_compiler=yes

21846

else

21847

echo "$as_me: failed program was:" >&5

21848

@@ -23652,17 +22801,10 @@

21848

@@ -23662,17 +22811,10 @@

21849

rm -f conftest.er1

21850

cat conftest.err >&5

21851

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

21867

ac_header_preproc=yes

21868

else

21869

echo "$as_me: failed program was:" >&5

21870

@@ -23777,27 +22919,10 @@

21870

@@ -23787,27 +22929,10 @@

21871

rm -f conftest.er1

21872

cat conftest.err >&5

21873

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

21899

has_option=yes

21900

else

21901

echo "$as_me: failed program was:" >&5

21902

@@ -23913,7 +23038,7 @@

21903

and GIT_LIBS to avoid the need to call pkg-config.

21904

See the pkg-config man page for more details.

21905

21906

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21907

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21908

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

21909

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21910

is in your PATH or set the PKG_CONFIG environment variable to the full

21911

21902

@@ -23923,7 +23048,7 @@

21912

21903

and GIT_LIBS to avoid the need to call pkg-config.

21913

21904

See the pkg-config man page for more details.

21914

21905

21915

21906

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21916

21907

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21908

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

21909

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21910

is in your PATH or set the PKG_CONFIG environment variable to the full

21911

@@ -23933,7 +23058,7 @@

21912

and GIT_LIBS to avoid the need to call pkg-config.

21913

See the pkg-config man page for more details.

21914

21915

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21916

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21917

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

21918

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

21919

else

21920

@@ -24025,7 +23150,7 @@

21921

and GAILUTIL_LIBS to avoid the need to call pkg-config.

21922

See the pkg-config man page for more details.

21923

21924

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21925

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21926

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

21927

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21928

is in your PATH or set the PKG_CONFIG environment variable to the full

21929

21920

@@ -24035,7 +23160,7 @@

21930

21921

and GAILUTIL_LIBS to avoid the need to call pkg-config.

21931

21922

See the pkg-config man page for more details.

21932

21923

21933

21924

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21934

21925

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21926

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

21927

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21928

is in your PATH or set the PKG_CONFIG environment variable to the full

21929

@@ -24045,7 +23170,7 @@

21930

and GAILUTIL_LIBS to avoid the need to call pkg-config.

21931

See the pkg-config man page for more details.

21932

21933

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21934

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21935

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

21936

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

21937

else

21938

@@ -24139,7 +23264,7 @@

21939

and GTK_LIBS to avoid the need to call pkg-config.

21940

See the pkg-config man page for more details.

21941

21942

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21943

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21944

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

21945

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21946

is in your PATH or set the PKG_CONFIG environment variable to the full

21947

21938

@@ -24149,7 +23274,7 @@

21948

21939

and GTK_LIBS to avoid the need to call pkg-config.

21949

21940

See the pkg-config man page for more details.

21950

21941

21951

21942

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21952

21943

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21944

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

21945

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21946

is in your PATH or set the PKG_CONFIG environment variable to the full

21947

@@ -24159,7 +23284,7 @@

21948

and GTK_LIBS to avoid the need to call pkg-config.

21949

See the pkg-config man page for more details.

21950

21951

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21952

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21953

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

21954

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

21955

else

21956

@@ -24253,7 +23378,7 @@

21957

and GNOME_APPLETS_LIBS to avoid the need to call pkg-config.

21958

See the pkg-config man page for more details.

21959

21960

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21961

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21962

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

21963

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21964

is in your PATH or set the PKG_CONFIG environment variable to the full

21965

21956

@@ -24263,7 +23388,7 @@

21966

21957

and GNOME_APPLETS_LIBS to avoid the need to call pkg-config.

21967

21958

See the pkg-config man page for more details.

21968

21959

21969

21960

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21970

21961

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21962

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

21963

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21964

is in your PATH or set the PKG_CONFIG environment variable to the full

21965

@@ -24273,7 +23398,7 @@

21966

and GNOME_APPLETS_LIBS to avoid the need to call pkg-config.

21967

See the pkg-config man page for more details.

21968

21969

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21970

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21971

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

21972

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

21973

else

21974

@@ -24367,7 +23492,7 @@

21975

and GNOME_LIBS2_LIBS to avoid the need to call pkg-config.

21976

See the pkg-config man page for more details.

21977

21978

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21979

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21980

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

21981

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21982

is in your PATH or set the PKG_CONFIG environment variable to the full

21983

21974

@@ -24377,7 +23502,7 @@

21984

21975

and GNOME_LIBS2_LIBS to avoid the need to call pkg-config.

21985

21976

See the pkg-config man page for more details.

21986

21977

21987

21978

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21988

21979

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21980

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

21981

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

21982

is in your PATH or set the PKG_CONFIG environment variable to the full

21983

@@ -24387,7 +23512,7 @@

21984

and GNOME_LIBS2_LIBS to avoid the need to call pkg-config.

21985

See the pkg-config man page for more details.

21986

21987

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21988

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21989

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

21990

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

21991

else

21992

@@ -24481,7 +23606,7 @@

21993

and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config.

21994

See the pkg-config man page for more details.

21995

21996

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

21997

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21998

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

21999

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22000

is in your PATH or set the PKG_CONFIG environment variable to the full

22001

21992

@@ -24491,7 +23616,7 @@

22002

21993

and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config.

22003

21994

See the pkg-config man page for more details.

22004

21995

22005

21996

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22006

21997

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

21998

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

21999

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22000

is in your PATH or set the PKG_CONFIG environment variable to the full

22001

@@ -24501,7 +23626,7 @@

22002

and GNOMEDESKTOP_LIBS to avoid the need to call pkg-config.

22003

See the pkg-config man page for more details.

22004

22005

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22006

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22007

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

22008

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

22009

else

22010

@@ -24596,7 +23721,7 @@

22011

and GNOME_VFS_APPLETS_LIBS to avoid the need to call pkg-config.

22012

See the pkg-config man page for more details.

22013

22014

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22015

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22016

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

22017

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22018

is in your PATH or set the PKG_CONFIG environment variable to the full

22019

22010

@@ -24606,7 +23731,7 @@

22020

22011

and GNOME_VFS_APPLETS_LIBS to avoid the need to call pkg-config.

22021

22012

See the pkg-config man page for more details.

22022

22013

22023

22014

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22024

22015

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22016

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

22017

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22018

is in your PATH or set the PKG_CONFIG environment variable to the full

22019

@@ -24616,7 +23741,7 @@

22020

and GNOME_VFS_APPLETS_LIBS to avoid the need to call pkg-config.

22021

See the pkg-config man page for more details.

22022

22023

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22024

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22025

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

22026

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

22027

else

22028

@@ -24718,7 +23843,7 @@

22029

and LIBGLADE_LIBS to avoid the need to call pkg-config.

22030

See the pkg-config man page for more details.

22031

22032

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22033

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22034

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

22035

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22036

is in your PATH or set the PKG_CONFIG environment variable to the full

22037

22028

@@ -24728,7 +23853,7 @@

22038

22029

and LIBGLADE_LIBS to avoid the need to call pkg-config.

22039

22030

See the pkg-config man page for more details.

22040

22031

22041

22032

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22042

22033

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22034

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

22035

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22036

is in your PATH or set the PKG_CONFIG environment variable to the full

22037

@@ -24738,7 +23863,7 @@

22038

and LIBGLADE_LIBS to avoid the need to call pkg-config.

22039

See the pkg-config man page for more details.

22040

22041

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22042

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22043

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

22044

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

22045

else

22046

@@ -24801,7 +23926,9 @@

22046

@@ -24811,7 +23936,9 @@

22047

# Put the nasty error message in config.log where it belongs

22048

echo "$GTOP_APPLETS_PKG_ERRORS" >&5

22049

22054

echo "$as_me: WARNING: libgtop not found. Not building gtop applets." >&2;}

22055

elif test $pkg_failed = untried; then

22056

{ echo "$as_me:$LINENO: WARNING: libgtop not found. Not building gtop applets." >&5

22057

@@ -24883,7 +24010,9 @@

22057

@@ -24893,7 +24020,9 @@

22058

# Put the nasty error message in config.log where it belongs

22059

echo "$LIBGNOMEKBDUI_PKG_ERRORS" >&5

22060

22065

elif test $pkg_failed = untried; then

22066

HAVE_LIBGNOMEKBD=no

22067

else

22068

@@ -24973,7 +24102,9 @@

22068

@@ -24983,7 +24112,9 @@

22069

# Put the nasty error message in config.log where it belongs

22070

echo "$GNOME_SETTINGS_DAEMON_PKG_ERRORS" >&5

22071

22076

elif test $pkg_failed = untried; then

22077

HAVE_GNOME_SETTINGS_DAEMON=no

22078

else

22079

@@ -25051,7 +24182,9 @@

22079

@@ -25061,7 +24192,9 @@

22080

# Put the nasty error message in config.log where it belongs

22081

echo "$LIBWNCK_PKG_ERRORS" >&5

22082

22087

echo "$as_me: error: libwnck is required to build gnome-applets." >&2;}

22088

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

22089

elif test $pkg_failed = untried; then

22090

@@ -25130,7 +24263,9 @@

22090

@@ -25140,7 +24273,9 @@

22091

# Put the nasty error message in config.log where it belongs

22092

echo "$LIBNOTIFY_PKG_ERRORS" >&5

22093

22098

elif test $pkg_failed = untried; then

22099

HAVE_LIBNOTIFY="no"

22100

else

22101

@@ -25243,7 +24378,7 @@

22102

and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config.

22103

See the pkg-config man page for more details.

22104

22105

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22106

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22107

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

22108

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22109

is in your PATH or set the PKG_CONFIG environment variable to the full

22110

22101

@@ -25253,7 +24388,7 @@

22111

22102

and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config.

22112

22103

See the pkg-config man page for more details.

22113

22104

22114

22105

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22115

22106

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22107

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

22108

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22109

is in your PATH or set the PKG_CONFIG environment variable to the full

22110

@@ -25263,7 +24398,7 @@

22111

and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config.

22112

See the pkg-config man page for more details.

22113

22114

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22115

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22116

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

22117

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

22118

else

22119

@@ -25326,7 +24461,9 @@

22119

@@ -25336,7 +24471,9 @@

22120

# Put the nasty error message in config.log where it belongs

22121

echo "$DBUS_PKG_ERRORS" >&5

22122

22127

elif test $pkg_failed = untried; then

22128

HAVE_DBUS=no

22129

else

22130

@@ -25416,7 +24553,9 @@

22130

@@ -25426,7 +24563,9 @@

22131

# Put the nasty error message in config.log where it belongs

22132

echo "$HAL_PKG_ERRORS" >&5

22133

22138

elif test $pkg_failed = untried; then

22139

HAVE_HAL="no"

22140

else

22141

@@ -25503,7 +24642,9 @@

22141

@@ -25513,7 +24652,9 @@

22142

# Put the nasty error message in config.log where it belongs

22143

echo "$GUCHARMAP_PKG_ERRORS" >&5

22144

22149

elif test $pkg_failed = untried; then

22150

HAVE_GUCHARMAP="no"

22151

else

22152

@@ -25604,7 +24745,9 @@

22152

@@ -25614,7 +24755,9 @@

22153

# Put the nasty error message in config.log where it belongs

22154

echo "$PYGTK_PKG_ERRORS" >&5

22155

22160

elif test $pkg_failed = untried; then

22161

HAVE_PYGTK="no"

22162

else

22163

@@ -25708,7 +24851,7 @@

22164

and XML2_LIBS to avoid the need to call pkg-config.

22165

See the pkg-config man page for more details.

22166

22167

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22168

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22169

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

22170

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22171

is in your PATH or set the PKG_CONFIG environment variable to the full

22172

22163

@@ -25718,7 +24861,7 @@

22173

22164

and XML2_LIBS to avoid the need to call pkg-config.

22174

22165

See the pkg-config man page for more details.

22175

22166

22176

22167

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22177

22168

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22178

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

22179

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

22180

else

22181

@@ -25750,7 +24893,7 @@

22169

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

22170

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22171

is in your PATH or set the PKG_CONFIG environment variable to the full

22172

@@ -25728,7 +24871,7 @@

22173

and XML2_LIBS to avoid the need to call pkg-config.

22174

See the pkg-config man page for more details.

22175

22176

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22177

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22178

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

22179

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

22180

else

22181

@@ -25832,7 +24975,7 @@

22182

and LIBGWEATHER_LIBS to avoid the need to call pkg-config.

22183

See the pkg-config man page for more details.

22184

22185

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22186

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22187

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

22188

echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

22189

is in your PATH or set the PKG_CONFIG environment variable to the full

22190

@@ -25842,7 +24985,7 @@

22191

and LIBGWEATHER_LIBS to avoid the need to call pkg-config.

22192

See the pkg-config man page for more details.

22193

22194

-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.

22195

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

22196

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

22197

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

22198

else

22199

@@ -25876,7 +25019,7 @@

22182

22200

IFS=$as_save_IFS

22183

22201

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

22184

22202

for ac_exec_ext in '' $ac_executable_extensions; do

22187

22205

ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"

22188

22206

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22189

22207

break 2

22190

@@ -25799,7 +24942,7 @@

22208

@@ -25925,7 +25068,7 @@

22191

22209

IFS=$as_save_IFS

22192

22210

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

22193

22211

for ac_exec_ext in '' $ac_executable_extensions; do

22196

22214

ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"

22197

22215

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22198

22216

break 2

22199

@@ -25840,7 +24983,7 @@

22217

@@ -25966,7 +25109,7 @@

22200

22218

IFS=$as_save_IFS

22201

22219

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

22202

22220

for ac_exec_ext in '' $ac_executable_extensions; do

22205

22223

ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"

22206

22224

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22207

22225

break 2

22208

@@ -25887,7 +25030,7 @@

22226

@@ -26013,7 +25156,7 @@

22209

22227

IFS=$as_save_IFS

22210

22228

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

22211

22229

for ac_exec_ext in '' $ac_executable_extensions; do

22214

22232

ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"

22215

22233

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22216

22234

break 2

22217

@@ -25934,7 +25077,7 @@

22235

@@ -26060,7 +25203,7 @@

22218

22236

IFS=$as_save_IFS

22219

22237

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

22220

22238

for ac_exec_ext in '' $ac_executable_extensions; do

22223

22241

ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"

22224

22242

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22225

22243

break 2

22226

@@ -25982,7 +25125,7 @@

22244

@@ -26108,7 +25251,7 @@

22227

22245

IFS=$as_save_IFS

22228

22246

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

22229

22247

for ac_exec_ext in '' $ac_executable_extensions; do

22232

22250

ac_cv_path_JW="$as_dir/$ac_word$ac_exec_ext"

22233

22251

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22234

22252

break 2

22235

@@ -26134,27 +25277,10 @@

22253

@@ -26260,27 +25403,10 @@

22236

22254

rm -f conftest.er1

22237

22255

cat conftest.err >&5

22238

22256

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

22264

22282

ac_header_compiler=yes

22265

22283

else

22266

22284

echo "$as_me: failed program was:" >&5

22267

@@ -26190,17 +25316,10 @@

22285

@@ -26316,17 +25442,10 @@

22268

22286

rm -f conftest.er1

22269

22287

cat conftest.err >&5

22270

22288

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

22286

22304

ac_header_preproc=yes

22287

22305

else

22288

22306

echo "$as_me: failed program was:" >&5

22289

@@ -26293,27 +25412,11 @@

22307

@@ -26419,27 +25538,11 @@

22290

22308

rm -f conftest.er1

22291

22309

cat conftest.err >&5

22292

22310

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

22319

22337

am_cv_val_LC_MESSAGES=yes

22320

22338

else

22321

22339

echo "$as_me: failed program was:" >&5

22322

@@ -26322,7 +25425,7 @@

22340

@@ -26448,7 +25551,7 @@

22323

22341

am_cv_val_LC_MESSAGES=no

22324

22342

fi

22325

22343

22328

22346

conftest$ac_exeext conftest.$ac_ext

22329

22347

fi

22330

22348

{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

22331

@@ -26378,27 +25481,10 @@

22349

@@ -26504,27 +25607,10 @@

22332

22350

rm -f conftest.er1

22333

22351

cat conftest.err >&5

22334

22352

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

22360

22378

ac_header_compiler=yes

22361

22379

else

22362

22380

echo "$as_me: failed program was:" >&5

22363

@@ -26434,17 +25520,10 @@

22381

@@ -26560,17 +25646,10 @@

22364

22382

rm -f conftest.er1

22365

22383

cat conftest.err >&5

22366

22384

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

22382

22400

ac_header_preproc=yes

22383

22401

else

22384

22402

echo "$as_me: failed program was:" >&5

22385

@@ -26535,27 +25614,11 @@

22403

@@ -26661,27 +25740,11 @@

22386

22404

rm -f conftest.er1

22387

22405

cat conftest.err >&5

22388

22406

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

22415

22433

gt_cv_func_ngettext_libc=yes

22416

22434

else

22417

22435

echo "$as_me: failed program was:" >&5

22418

@@ -26564,7 +25627,7 @@

22436

@@ -26690,7 +25753,7 @@

22419

22437

gt_cv_func_ngettext_libc=no

22420

22438

fi

22421

22439

22424

22442

conftest$ac_exeext conftest.$ac_ext

22425

22443

22426

22444

fi

22427

@@ -26607,27 +25670,11 @@

22445

@@ -26733,27 +25796,11 @@

22428

22446

rm -f conftest.er1

22429

22447

cat conftest.err >&5

22430

22448

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

22457

22475

gt_cv_func_dgettext_libc=yes

22458

22476

else

22459

22477

echo "$as_me: failed program was:" >&5

22460

@@ -26636,7 +25683,7 @@

22478

@@ -26762,7 +25809,7 @@

22461

22479

gt_cv_func_dgettext_libc=no

22462

22480

fi

22463

22481

22466

22484

conftest$ac_exeext conftest.$ac_ext

22467

22485

22468

22486

fi

22469

@@ -26712,27 +25759,11 @@

22487

@@ -26838,27 +25885,11 @@

22470

22488

rm -f conftest.er1

22471

22489

cat conftest.err >&5

22472

22490

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

22499

22517

eval "$as_ac_var=yes"

22500

22518

else

22501

22519

echo "$as_me: failed program was:" >&5

22502

@@ -26741,7 +25772,7 @@

22520

@@ -26867,7 +25898,7 @@

22503

22521

eval "$as_ac_var=no"

22504

22522

fi

22505

22523

22508

22526

conftest$ac_exeext conftest.$ac_ext

22509

22527

fi

22510

22528

ac_res=`eval echo '${'$as_ac_var'}'`

22511

@@ -26806,27 +25837,11 @@

22529

@@ -26932,27 +25963,11 @@

22512

22530

rm -f conftest.er1

22513

22531

cat conftest.err >&5

22514

22532

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

22541

22559

ac_cv_lib_intl_bindtextdomain=yes

22542

22560

else

22543

22561

echo "$as_me: failed program was:" >&5

22544

@@ -26835,7 +25850,7 @@

22562

@@ -26961,7 +25976,7 @@

22545

22563

ac_cv_lib_intl_bindtextdomain=no

22546

22564

fi

22547

22565

22550

22568

conftest$ac_exeext conftest.$ac_ext

22551

22569

LIBS=$ac_check_lib_save_LIBS

22552

22570

fi

22553

@@ -26884,27 +25899,11 @@

22571

@@ -27010,27 +26025,11 @@

22554

22572

rm -f conftest.er1

22555

22573

cat conftest.err >&5

22556

22574

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

22583

22601

ac_cv_lib_intl_ngettext=yes

22584

22602

else

22585

22603

echo "$as_me: failed program was:" >&5

22586

@@ -26913,7 +25912,7 @@

22604

@@ -27039,7 +26038,7 @@

22587

22605

ac_cv_lib_intl_ngettext=no

22588

22606

fi

22589

22607

22592

22610

conftest$ac_exeext conftest.$ac_ext

22593

22611

LIBS=$ac_check_lib_save_LIBS

22594

22612

fi

22595

@@ -26962,27 +25961,11 @@

22613

@@ -27088,27 +26087,11 @@

22596

22614

rm -f conftest.er1

22597

22615

cat conftest.err >&5

22598

22616

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

22625

22643

ac_cv_lib_intl_dgettext=yes

22626

22644

else

22627

22645

echo "$as_me: failed program was:" >&5

22628

@@ -26991,7 +25974,7 @@

22646

@@ -27117,7 +26100,7 @@

22629

22647

ac_cv_lib_intl_dgettext=no

22630

22648

fi

22631

22649

22634

22652

conftest$ac_exeext conftest.$ac_ext

22635

22653

LIBS=$ac_check_lib_save_LIBS

22636

22654

fi

22637

@@ -27053,27 +26036,11 @@

22655

@@ -27179,27 +26162,11 @@

22638

22656

rm -f conftest.er1

22639

22657

cat conftest.err >&5

22640

22658

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

22667

22685

ac_cv_lib_intl_ngettext=yes

22668

22686

else

22669

22687

echo "$as_me: failed program was:" >&5

22670

@@ -27082,7 +26049,7 @@

22688

@@ -27208,7 +26175,7 @@

22671

22689

ac_cv_lib_intl_ngettext=no

22672

22690

fi

22673

22691

22676

22694

conftest$ac_exeext conftest.$ac_ext

22677

22695

LIBS=$ac_check_lib_save_LIBS

22678

22696

fi

22679

@@ -27131,27 +26098,11 @@

22697

@@ -27257,27 +26224,11 @@

22680

22698

rm -f conftest.er1

22681

22699

cat conftest.err >&5

22682

22700

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

22709

22727

ac_cv_lib_intl_dcgettext=yes

22710

22728

else

22711

22729

echo "$as_me: failed program was:" >&5

22712

@@ -27160,7 +26111,7 @@

22730

@@ -27286,7 +26237,7 @@

22713

22731

ac_cv_lib_intl_dcgettext=no

22714

22732

fi

22715

22733

22718

22736

conftest$ac_exeext conftest.$ac_ext

22719

22737

LIBS=$ac_check_lib_save_LIBS

22720

22738

fi

22721

@@ -27255,27 +26206,11 @@

22722

rm -f conftest.er1

22723

cat conftest.err >&5

22724

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

22725

- (exit $ac_status); } &&

22726

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22727

- { (case "(($ac_try" in

22728

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

22729

- *) ac_try_echo=$ac_try;;

22730

-esac

22731

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

22732

- (eval "$ac_try") 2>&5

22733

- ac_status=$?

22734

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

22735

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

22736

- { ac_try='test -s conftest$ac_exeext'

22737

- { (case "(($ac_try" in

22738

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

22739

- *) ac_try_echo=$ac_try;;

22740

-esac

22741

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

22742

- (eval "$ac_try") 2>&5

22743

- ac_status=$?

22744

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

22745

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

22746

+ (exit $ac_status); } && {

22747

+ test -z "$ac_c_werror_flag" ||

22748

+ test ! -s conftest.err

22749

+ } && test -s conftest$ac_exeext &&

22750

+ $as_test_x conftest$ac_exeext; then

22751

eval "$as_ac_var=yes"

22752

else

22753

echo "$as_me: failed program was:" >&5

22754

@@ -27284,7 +26219,7 @@

22755

eval "$as_ac_var=no"

22756

fi

22757

22758

-rm -f core conftest.err conftest.$ac_objext \

22759

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22760

conftest$ac_exeext conftest.$ac_ext

22761

fi

22762

ac_res=`eval echo '${'$as_ac_var'}'`

22763

@@ -27431,27 +26366,11 @@

22764

rm -f conftest.er1

22765

cat conftest.err >&5

22766

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

22767

- (exit $ac_status); } &&

22768

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22769

- { (case "(($ac_try" in

22770

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

22771

- *) ac_try_echo=$ac_try;;

22772

-esac

22773

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

22774

- (eval "$ac_try") 2>&5

22775

- ac_status=$?

22776

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

22777

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

22778

- { ac_try='test -s conftest$ac_exeext'

22779

- { (case "(($ac_try" in

22780

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

22781

- *) ac_try_echo=$ac_try;;

22782

-esac

22783

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

22784

- (eval "$ac_try") 2>&5

22785

- ac_status=$?

22786

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

22787

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

22788

+ (exit $ac_status); } && {

22789

+ test -z "$ac_c_werror_flag" ||

22790

+ test ! -s conftest.err

22791

+ } && test -s conftest$ac_exeext &&

22792

+ $as_test_x conftest$ac_exeext; then

22793

eval "$as_ac_var=yes"

22794

else

22795

echo "$as_me: failed program was:" >&5

22796

@@ -27460,7 +26379,7 @@

22797

eval "$as_ac_var=no"

22798

fi

22799

22800

-rm -f core conftest.err conftest.$ac_objext \

22801

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22802

conftest$ac_exeext conftest.$ac_ext

22803

fi

22804

ac_res=`eval echo '${'$as_ac_var'}'`

22805

@@ -27521,7 +26440,7 @@

22739

@@ -27381,27 +26332,11 @@

22740

rm -f conftest.er1

22741

cat conftest.err >&5

22742

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

22743

- (exit $ac_status); } &&

22744

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22745

- { (case "(($ac_try" in

22746

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

22747

- *) ac_try_echo=$ac_try;;

22748

-esac

22749

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

22750

- (eval "$ac_try") 2>&5

22751

- ac_status=$?

22752

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

22753

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

22754

- { ac_try='test -s conftest$ac_exeext'

22755

- { (case "(($ac_try" in

22756

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

22757

- *) ac_try_echo=$ac_try;;

22758

-esac

22759

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

22760

- (eval "$ac_try") 2>&5

22761

- ac_status=$?

22762

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

22763

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

22764

+ (exit $ac_status); } && {

22765

+ test -z "$ac_c_werror_flag" ||

22766

+ test ! -s conftest.err

22767

+ } && test -s conftest$ac_exeext &&

22768

+ $as_test_x conftest$ac_exeext; then

22769

eval "$as_ac_var=yes"

22770

else

22771

echo "$as_me: failed program was:" >&5

22772

@@ -27410,7 +26345,7 @@

22773

eval "$as_ac_var=no"

22774

fi

22775

22776

-rm -f core conftest.err conftest.$ac_objext \

22777

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22778

conftest$ac_exeext conftest.$ac_ext

22779

fi

22780

ac_res=`eval echo '${'$as_ac_var'}'`

22781

@@ -27557,27 +26492,11 @@

22782

rm -f conftest.er1

22783

cat conftest.err >&5

22784

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

22785

- (exit $ac_status); } &&

22786

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22787

- { (case "(($ac_try" in

22788

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

22789

- *) ac_try_echo=$ac_try;;

22790

-esac

22791

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

22792

- (eval "$ac_try") 2>&5

22793

- ac_status=$?

22794

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

22795

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

22796

- { ac_try='test -s conftest$ac_exeext'

22797

- { (case "(($ac_try" in

22798

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

22799

- *) ac_try_echo=$ac_try;;

22800

-esac

22801

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

22802

- (eval "$ac_try") 2>&5

22803

- ac_status=$?

22804

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

22805

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

22806

+ (exit $ac_status); } && {

22807

+ test -z "$ac_c_werror_flag" ||

22808

+ test ! -s conftest.err

22809

+ } && test -s conftest$ac_exeext &&

22810

+ $as_test_x conftest$ac_exeext; then

22811

eval "$as_ac_var=yes"

22812

else

22813

echo "$as_me: failed program was:" >&5

22814

@@ -27586,7 +26505,7 @@

22815

eval "$as_ac_var=no"

22816

fi

22817

22818

-rm -f core conftest.err conftest.$ac_objext \

22819

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22820

conftest$ac_exeext conftest.$ac_ext

22821

fi

22822

ac_res=`eval echo '${'$as_ac_var'}'`

22823

@@ -27647,7 +26566,7 @@

22806

22824

IFS=$as_save_IFS

22807

22825

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

22808

22826

for ac_exec_ext in '' $ac_executable_extensions; do

22811

22829

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

22812

22830

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22813

22831

break 2

22814

@@ -27609,27 +26528,11 @@

22832

@@ -27735,27 +26654,11 @@

22815

22833

rm -f conftest.er1

22816

22834

cat conftest.err >&5

22817

22835

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

22844

22862

CATOBJEXT=.gmo

22845

22863

DATADIRNAME=share

22846

22864

else

22847

@@ -27701,27 +26604,11 @@

22865

@@ -27827,27 +26730,11 @@

22848

22866

rm -f conftest.er1

22849

22867

cat conftest.err >&5

22850

22868

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

22877

22895

ac_cv_func_bind_textdomain_codeset=yes

22878

22896

else

22879

22897

echo "$as_me: failed program was:" >&5

22880

@@ -27730,7 +26617,7 @@

22898

@@ -27856,7 +26743,7 @@

22881

22899

ac_cv_func_bind_textdomain_codeset=no

22882

22900

fi

22883

22901

22886

22904

conftest$ac_exeext conftest.$ac_ext

22887

22905

fi

22888

22906

{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

22889

@@ -27751,7 +26638,7 @@

22907

@@ -27877,7 +26764,7 @@

22890

22908

esac

22891

22909

fi

22892

22910

22895

22913

conftest$ac_exeext conftest.$ac_ext

22896

22914

LIBS="$glib_save_LIBS"

22897

22915

INSTOBJEXT=.mo

22898

@@ -28040,27 +26927,10 @@

22899

rm -f conftest.er1

22900

cat conftest.err >&5

22901

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

22902

- (exit $ac_status); } &&

22903

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22904

- { (case "(($ac_try" in

22905

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

22906

- *) ac_try_echo=$ac_try;;

22907

-esac

22908

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

22909

- (eval "$ac_try") 2>&5

22910

- ac_status=$?

22911

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

22912

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

22913

- { ac_try='test -s conftest.$ac_objext'

22914

- { (case "(($ac_try" in

22915

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

22916

- *) ac_try_echo=$ac_try;;

22917

-esac

22918

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

22919

- (eval "$ac_try") 2>&5

22920

- ac_status=$?

22921

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

22922

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

22923

+ (exit $ac_status); } && {

22924

+ test -z "$ac_c_werror_flag" ||

22925

+ test ! -s conftest.err

22926

+ } && test -s conftest.$ac_objext; then

22927

ac_header_compiler=yes

22928

else

22929

echo "$as_me: failed program was:" >&5

22930

@@ -28096,17 +26966,10 @@

22931

rm -f conftest.er1

22932

cat conftest.err >&5

22933

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

22934

- (exit $ac_status); } >/dev/null; then

22935

- if test -s conftest.err; then

22936

- ac_cpp_err=$ac_c_preproc_warn_flag

22937

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

22938

- else

22939

- ac_cpp_err=

22940

- fi

22941

-else

22942

- ac_cpp_err=yes

22943

-fi

22944

-if test -z "$ac_cpp_err"; then

22945

+ (exit $ac_status); } >/dev/null && {

22946

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

22947

+ test ! -s conftest.err

22948

+ }; then

22949

ac_header_preproc=yes

22950

else

22951

echo "$as_me: failed program was:" >&5

22952

@@ -28210,27 +27073,11 @@

22953

rm -f conftest.er1

22954

cat conftest.err >&5

22955

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

22956

- (exit $ac_status); } &&

22957

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22958

- { (case "(($ac_try" in

22959

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

22960

- *) ac_try_echo=$ac_try;;

22961

-esac

22962

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

22963

- (eval "$ac_try") 2>&5

22964

- ac_status=$?

22965

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

22966

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

22967

- { ac_try='test -s conftest$ac_exeext'

22968

- { (case "(($ac_try" in

22969

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

22970

- *) ac_try_echo=$ac_try;;

22971

-esac

22972

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

22973

- (eval "$ac_try") 2>&5

22974

- ac_status=$?

22975

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

22976

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

22977

+ (exit $ac_status); } && {

22978

+ test -z "$ac_c_werror_flag" ||

22979

+ test ! -s conftest.err

22980

+ } && test -s conftest$ac_exeext &&

22981

+ $as_test_x conftest$ac_exeext; then

22982

ac_cv_lib_apm_apm_read=yes

22983

else

22984

echo "$as_me: failed program was:" >&5

22985

@@ -28239,7 +27086,7 @@

22986

ac_cv_lib_apm_apm_read=no

22987

fi

22988

22989

-rm -f core conftest.err conftest.$ac_objext \

22990

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22991

conftest$ac_exeext conftest.$ac_ext

22992

LIBS=$ac_check_lib_save_LIBS

22993

fi

22994

@@ -28297,27 +27144,11 @@

22995

rm -f conftest.er1

22996

cat conftest.err >&5

22997

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

22998

- (exit $ac_status); } &&

22999

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23000

- { (case "(($ac_try" in

23001

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

23002

- *) ac_try_echo=$ac_try;;

23003

-esac

23004

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

23005

- (eval "$ac_try") 2>&5

23006

- ac_status=$?

23007

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

23008

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

23009

- { ac_try='test -s conftest$ac_exeext'

23010

- { (case "(($ac_try" in

23011

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

23012

- *) ac_try_echo=$ac_try;;

23013

-esac

23014

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

23015

- (eval "$ac_try") 2>&5

23016

- ac_status=$?

23017

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

23018

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

23019

+ (exit $ac_status); } && {

23020

+ test -z "$ac_c_werror_flag" ||

23021

+ test ! -s conftest.err

23022

+ } && test -s conftest$ac_exeext &&

23023

+ $as_test_x conftest$ac_exeext; then

23024

ac_cv_lib_apm_apm_read=yes

23025

else

23026

echo "$as_me: failed program was:" >&5

23027

@@ -28326,7 +27157,7 @@

23028

ac_cv_lib_apm_apm_read=no

23029

fi

23030

23031

-rm -f core conftest.err conftest.$ac_objext \

23032

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

23033

conftest$ac_exeext conftest.$ac_ext

23034

LIBS=$ac_check_lib_save_LIBS

23035

fi

23036

@@ -28383,27 +27214,10 @@

23037

rm -f conftest.er1

23038

cat conftest.err >&5

23039

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

23040

- (exit $ac_status); } &&

23041

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23042

- { (case "(($ac_try" in

23043

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

23044

- *) ac_try_echo=$ac_try;;

23045

-esac

23046

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

23047

- (eval "$ac_try") 2>&5

23048

- ac_status=$?

23049

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

23050

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

23051

- { ac_try='test -s conftest.$ac_objext'

23052

- { (case "(($ac_try" in

23053

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

23054

- *) ac_try_echo=$ac_try;;

23055

-esac

23056

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

23057

- (eval "$ac_try") 2>&5

23058

- ac_status=$?

23059

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

23060

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

23061

+ (exit $ac_status); } && {

23062

+ test -z "$ac_c_werror_flag" ||

23063

+ test ! -s conftest.err

23064

+ } && test -s conftest.$ac_objext; then

23065

ac_header_compiler=yes

23066

else

23067

echo "$as_me: failed program was:" >&5

23068

@@ -28439,17 +27253,10 @@

23069

rm -f conftest.er1

23070

cat conftest.err >&5

23071

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

23072

- (exit $ac_status); } >/dev/null; then

23073

- if test -s conftest.err; then

23074

- ac_cpp_err=$ac_c_preproc_warn_flag

23075

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

23076

- else

23077

- ac_cpp_err=

23078

- fi

23079

-else

23080

- ac_cpp_err=yes

23081

-fi

23082

-if test -z "$ac_cpp_err"; then

23083

+ (exit $ac_status); } >/dev/null && {

23084

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

23085

+ test ! -s conftest.err

23086

+ }; then

23087

ac_header_preproc=yes

23088

else

23089

echo "$as_me: failed program was:" >&5

23090

@@ -28670,7 +27477,9 @@

23091

# Put the nasty error message in config.log where it belongs

23092

echo "$MIXER_PKG_ERRORS" >&5

23093

23094

- HAVE_GST_VER=none

23095

+ { echo "$as_me:$LINENO: result: no" >&5

23096

+echo "${ECHO_T}no" >&6; }

23097

+ HAVE_GST_VER=none

23098

elif test $pkg_failed = untried; then

23099

HAVE_GST_VER=none

23100

else

23101

@@ -28745,7 +27554,9 @@

23102

# Put the nasty error message in config.log where it belongs

23103

echo "$MIXER_PKG_ERRORS" >&5

23104

23105

- HAVE_GST_VER=none

23106

+ { echo "$as_me:$LINENO: result: no" >&5

23107

+echo "${ECHO_T}no" >&6; }

23108

+ HAVE_GST_VER=none

23109

elif test $pkg_failed = untried; then

23110

HAVE_GST_VER=none

23111

else

23112

@@ -28843,27 +27654,10 @@

23113

rm -f conftest.er1

23114

cat conftest.err >&5

23115

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

23116

- (exit $ac_status); } &&

23117

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23118

- { (case "(($ac_try" in

23119

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

23120

- *) ac_try_echo=$ac_try;;

23121

-esac

23122

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

23123

- (eval "$ac_try") 2>&5

23124

- ac_status=$?

23125

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

23126

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

23127

- { ac_try='test -s conftest.$ac_objext'

23128

- { (case "(($ac_try" in

23129

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

23130

- *) ac_try_echo=$ac_try;;

23131

-esac

23132

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

23133

- (eval "$ac_try") 2>&5

23134

- ac_status=$?

23135

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

23136

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

23137

+ (exit $ac_status); } && {

23138

+ test -z "$ac_c_werror_flag" ||

23139

+ test ! -s conftest.err

23140

+ } && test -s conftest.$ac_objext; then

23141

ac_header_compiler=yes

23142

else

23143

echo "$as_me: failed program was:" >&5

23144

@@ -28899,17 +27693,10 @@

23145

rm -f conftest.er1

23146

cat conftest.err >&5

23147

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

23148

- (exit $ac_status); } >/dev/null; then

23149

- if test -s conftest.err; then

23150

- ac_cpp_err=$ac_c_preproc_warn_flag

23151

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

23152

- else

23153

- ac_cpp_err=

23154

- fi

23155

-else

23156

- ac_cpp_err=yes

23157

-fi

23158

-if test -z "$ac_cpp_err"; then

23159

+ (exit $ac_status); } >/dev/null && {

23160

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

23161

+ test ! -s conftest.err

23162

+ }; then

23163

ac_header_preproc=yes

23164

else

23165

echo "$as_me: failed program was:" >&5

23166

@@ -28958,238 +27745,106 @@

22916

@@ -28166,27 +27053,10 @@

22917

rm -f conftest.er1

22918

cat conftest.err >&5

22919

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

22920

- (exit $ac_status); } &&

22921

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22922

- { (case "(($ac_try" in

22923

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

22924

- *) ac_try_echo=$ac_try;;

22925

-esac

22926

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

22927

- (eval "$ac_try") 2>&5

22928

- ac_status=$?

22929

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

22930

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

22931

- { ac_try='test -s conftest.$ac_objext'

22932

- { (case "(($ac_try" in

22933

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

22934

- *) ac_try_echo=$ac_try;;

22935

-esac

22936

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

22937

- (eval "$ac_try") 2>&5

22938

- ac_status=$?

22939

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

22940

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

22941

+ (exit $ac_status); } && {

22942

+ test -z "$ac_c_werror_flag" ||

22943

+ test ! -s conftest.err

22944

+ } && test -s conftest.$ac_objext; then

22945

ac_header_compiler=yes

22946

else

22947

echo "$as_me: failed program was:" >&5

22948

@@ -28222,17 +27092,10 @@

22949

rm -f conftest.er1

22950

cat conftest.err >&5

22951

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

22952

- (exit $ac_status); } >/dev/null; then

22953

- if test -s conftest.err; then

22954

- ac_cpp_err=$ac_c_preproc_warn_flag

22955

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

22956

- else

22957

- ac_cpp_err=

22958

- fi

22959

-else

22960

- ac_cpp_err=yes

22961

-fi

22962

-if test -z "$ac_cpp_err"; then

22963

+ (exit $ac_status); } >/dev/null && {

22964

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

22965

+ test ! -s conftest.err

22966

+ }; then

22967

ac_header_preproc=yes

22968

else

22969

echo "$as_me: failed program was:" >&5

22970

@@ -28336,27 +27199,11 @@

22971

rm -f conftest.er1

22972

cat conftest.err >&5

22973

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

22974

- (exit $ac_status); } &&

22975

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

22976

- { (case "(($ac_try" in

22977

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

22978

- *) ac_try_echo=$ac_try;;

22979

-esac

22980

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

22981

- (eval "$ac_try") 2>&5

22982

- ac_status=$?

22983

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

22984

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

22985

- { ac_try='test -s conftest$ac_exeext'

22986

- { (case "(($ac_try" in

22987

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

22988

- *) ac_try_echo=$ac_try;;

22989

-esac

22990

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

22991

- (eval "$ac_try") 2>&5

22992

- ac_status=$?

22993

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

22994

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

22995

+ (exit $ac_status); } && {

22996

+ test -z "$ac_c_werror_flag" ||

22997

+ test ! -s conftest.err

22998

+ } && test -s conftest$ac_exeext &&

22999

+ $as_test_x conftest$ac_exeext; then

23000

ac_cv_lib_apm_apm_read=yes

23001

else

23002

echo "$as_me: failed program was:" >&5

23003

@@ -28365,7 +27212,7 @@

23004

ac_cv_lib_apm_apm_read=no

23005

fi

23006

23007

-rm -f core conftest.err conftest.$ac_objext \

23008

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

23009

conftest$ac_exeext conftest.$ac_ext

23010

LIBS=$ac_check_lib_save_LIBS

23011

fi

23012

@@ -28423,27 +27270,11 @@

23013

rm -f conftest.er1

23014

cat conftest.err >&5

23015

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

23016

- (exit $ac_status); } &&

23017

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23018

- { (case "(($ac_try" in

23019

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

23020

- *) ac_try_echo=$ac_try;;

23021

-esac

23022

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

23023

- (eval "$ac_try") 2>&5

23024

- ac_status=$?

23025

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

23026

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

23027

- { ac_try='test -s conftest$ac_exeext'

23028

- { (case "(($ac_try" in

23029

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

23030

- *) ac_try_echo=$ac_try;;

23031

-esac

23032

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

23033

- (eval "$ac_try") 2>&5

23034

- ac_status=$?

23035

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

23036

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

23037

+ (exit $ac_status); } && {

23038

+ test -z "$ac_c_werror_flag" ||

23039

+ test ! -s conftest.err

23040

+ } && test -s conftest$ac_exeext &&

23041

+ $as_test_x conftest$ac_exeext; then

23042

ac_cv_lib_apm_apm_read=yes

23043

else

23044

echo "$as_me: failed program was:" >&5

23045

@@ -28452,7 +27283,7 @@

23046

ac_cv_lib_apm_apm_read=no

23047

fi

23048

23049

-rm -f core conftest.err conftest.$ac_objext \

23050

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

23051

conftest$ac_exeext conftest.$ac_ext

23052

LIBS=$ac_check_lib_save_LIBS

23053

fi

23054

@@ -28509,27 +27340,10 @@

23055

rm -f conftest.er1

23056

cat conftest.err >&5

23057

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

23058

- (exit $ac_status); } &&

23059

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23060

- { (case "(($ac_try" in

23061

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

23062

- *) ac_try_echo=$ac_try;;

23063

-esac

23064

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

23065

- (eval "$ac_try") 2>&5

23066

- ac_status=$?

23067

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

23068

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

23069

- { ac_try='test -s conftest.$ac_objext'

23070

- { (case "(($ac_try" in

23071

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

23072

- *) ac_try_echo=$ac_try;;

23073

-esac

23074

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

23075

- (eval "$ac_try") 2>&5

23076

- ac_status=$?

23077

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

23078

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

23079

+ (exit $ac_status); } && {

23080

+ test -z "$ac_c_werror_flag" ||

23081

+ test ! -s conftest.err

23082

+ } && test -s conftest.$ac_objext; then

23083

ac_header_compiler=yes

23084

else

23085

echo "$as_me: failed program was:" >&5

23086

@@ -28565,17 +27379,10 @@

23087

rm -f conftest.er1

23088

cat conftest.err >&5

23089

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

23090

- (exit $ac_status); } >/dev/null; then

23091

- if test -s conftest.err; then

23092

- ac_cpp_err=$ac_c_preproc_warn_flag

23093

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

23094

- else

23095

- ac_cpp_err=

23096

- fi

23097

-else

23098

- ac_cpp_err=yes

23099

-fi

23100

-if test -z "$ac_cpp_err"; then

23101

+ (exit $ac_status); } >/dev/null && {

23102

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

23103

+ test ! -s conftest.err

23104

+ }; then

23105

ac_header_preproc=yes

23106

else

23107

echo "$as_me: failed program was:" >&5

23108

@@ -28796,7 +27603,9 @@

23109

# Put the nasty error message in config.log where it belongs

23110

echo "$MIXER_PKG_ERRORS" >&5

23111

23112

- HAVE_GST_VER=none

23113

+ { echo "$as_me:$LINENO: result: no" >&5

23114

+echo "${ECHO_T}no" >&6; }

23115

+ HAVE_GST_VER=none

23116

elif test $pkg_failed = untried; then

23117

HAVE_GST_VER=none

23118

else

23119

@@ -28871,7 +27680,9 @@

23120

# Put the nasty error message in config.log where it belongs

23121

echo "$MIXER_PKG_ERRORS" >&5

23122

23123

- HAVE_GST_VER=none

23124

+ { echo "$as_me:$LINENO: result: no" >&5

23125

+echo "${ECHO_T}no" >&6; }

23126

+ HAVE_GST_VER=none

23127

elif test $pkg_failed = untried; then

23128

HAVE_GST_VER=none

23129

else

23130

@@ -28969,27 +27780,10 @@

23131

rm -f conftest.er1

23132

cat conftest.err >&5

23133

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

23134

- (exit $ac_status); } &&

23135

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23136

- { (case "(($ac_try" in

23137

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

23138

- *) ac_try_echo=$ac_try;;

23139

-esac

23140

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

23141

- (eval "$ac_try") 2>&5

23142

- ac_status=$?

23143

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

23144

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

23145

- { ac_try='test -s conftest.$ac_objext'

23146

- { (case "(($ac_try" in

23147

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

23148

- *) ac_try_echo=$ac_try;;

23149

-esac

23150

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

23151

- (eval "$ac_try") 2>&5

23152

- ac_status=$?

23153

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

23154

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

23155

+ (exit $ac_status); } && {

23156

+ test -z "$ac_c_werror_flag" ||

23157

+ test ! -s conftest.err

23158

+ } && test -s conftest.$ac_objext; then

23159

ac_header_compiler=yes

23160

else

23161

echo "$as_me: failed program was:" >&5

23162

@@ -29025,17 +27819,10 @@

23163

rm -f conftest.er1

23164

cat conftest.err >&5

23165

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

23166

- (exit $ac_status); } >/dev/null; then

23167

- if test -s conftest.err; then

23168

- ac_cpp_err=$ac_c_preproc_warn_flag

23169

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

23170

- else

23171

- ac_cpp_err=

23172

- fi

23173

-else

23174

- ac_cpp_err=yes

23175

-fi

23176

-if test -z "$ac_cpp_err"; then

23177

+ (exit $ac_status); } >/dev/null && {

23178

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

23179

+ test ! -s conftest.err

23180

+ }; then

23181

ac_header_preproc=yes

23182

else

23183

echo "$as_me: failed program was:" >&5

23184

@@ -29084,238 +27871,106 @@

23167

23185

echo "${ECHO_T}$ac_cv_header_X11_extensions_XKB_h" >&6; }

23168

23186

23169

23187

fi

23483

23501

BUILD_MODEM_LIGHTS=yes

23484

23502

else

23485

23503

{ echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5

23486

@@ -29197,6 +27852,8 @@

23504

@@ -29323,6 +27978,8 @@

23487

23505

BUILD_MODEM_LIGHTS=no

23488

23506

fi

23489

23507

23492

23510

if test "x$BUILD_MODEM_LIGHTS" = "xyes"; then

23493

23511

APPLET_MODEMLIGHTS_TRUE=

23494

23512

APPLET_MODEMLIGHTS_FALSE='#'

23495

@@ -29265,27 +27922,10 @@

23513

@@ -29391,27 +28048,10 @@

23496

23514

rm -f conftest.er1

23497

23515

cat conftest.err >&5

23498

23516

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

23524

23542

ac_header_compiler=yes

23525

23543

else

23526

23544

echo "$as_me: failed program was:" >&5

23527

@@ -29321,17 +27961,10 @@

23545

@@ -29447,17 +28087,10 @@

23528

23546

rm -f conftest.er1

23529

23547

cat conftest.err >&5

23530

23548

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

23546

23564

ac_header_preproc=yes

23547

23565

else

23548

23566

echo "$as_me: failed program was:" >&5

23549

@@ -29541,27 +28174,10 @@

23567

@@ -29667,27 +28300,10 @@

23550

23568

rm -f conftest.er1

23551

23569

cat conftest.err >&5

23552

23570

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

23578

23596

have_ipv6=yes

23579

23597

else

23580

23598

echo "$as_me: failed program was:" >&5

23581

@@ -29647,27 +28263,11 @@

23599

@@ -29773,27 +28389,11 @@

23582

23600

rm -f conftest.er1

23583

23601

cat conftest.err >&5

23584

23602

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

23611

23629

ac_cv_func_getaddrinfo=yes

23612

23630

else

23613

23631

echo "$as_me: failed program was:" >&5

23614

@@ -29676,7 +28276,7 @@

23632

@@ -29802,7 +28402,7 @@

23615

23633

ac_cv_func_getaddrinfo=no

23616

23634

fi

23617

23635

23620

23638

conftest$ac_exeext conftest.$ac_ext

23621

23639

fi

23622

23640

{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5

23623

@@ -29731,27 +28331,11 @@

23641

@@ -29857,27 +28457,11 @@

23624

23642

rm -f conftest.er1

23625

23643

cat conftest.err >&5

23626

23644

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

23653

23671

eval "$as_ac_Lib=yes"

23654

23672

else

23655

23673

echo "$as_me: failed program was:" >&5

23656

@@ -29760,7 +28344,7 @@

23674

@@ -29886,7 +28470,7 @@

23657

23675

eval "$as_ac_Lib=no"

23658

23676

fi

23659

23677

23662

23680

conftest$ac_exeext conftest.$ac_ext

23663

23681

LIBS=$ac_check_lib_save_LIBS

23664

23682

fi

23665

@@ -29817,27 +28401,10 @@

23666

rm -f conftest.er1

23667

cat conftest.err >&5

23668

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

23669

- (exit $ac_status); } &&

23670

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23671

- { (case "(($ac_try" in

23672

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

23673

- *) ac_try_echo=$ac_try;;

23674

-esac

23675

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

23676

- (eval "$ac_try") 2>&5

23677

- ac_status=$?

23678

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

23679

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

23680

- { ac_try='test -s conftest.$ac_objext'

23681

- { (case "(($ac_try" in

23682

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

23683

- *) ac_try_echo=$ac_try;;

23684

-esac

23685

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

23686

- (eval "$ac_try") 2>&5

23687

- ac_status=$?

23688

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

23689

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

23690

+ (exit $ac_status); } && {

23691

+ test -z "$ac_c_werror_flag" ||

23692

+ test ! -s conftest.err

23693

+ } && test -s conftest.$ac_objext; then

23694

ac_cv_member_struct_tm_tm_gmtoff=yes

23695

else

23696

echo "$as_me: failed program was:" >&5

23697

@@ -29874,27 +28441,10 @@

23698

rm -f conftest.er1

23699

cat conftest.err >&5

23700

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

23701

- (exit $ac_status); } &&

23702

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23703

- { (case "(($ac_try" in

23704

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

23705

- *) ac_try_echo=$ac_try;;

23706

-esac

23707

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

23708

- (eval "$ac_try") 2>&5

23709

- ac_status=$?

23710

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

23711

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

23712

- { ac_try='test -s conftest.$ac_objext'

23713

- { (case "(($ac_try" in

23714

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

23715

- *) ac_try_echo=$ac_try;;

23716

-esac

23717

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

23718

- (eval "$ac_try") 2>&5

23719

- ac_status=$?

23720

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

23721

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

23722

+ (exit $ac_status); } && {

23723

+ test -z "$ac_c_werror_flag" ||

23724

+ test ! -s conftest.err

23725

+ } && test -s conftest.$ac_objext; then

23726

ac_cv_member_struct_tm_tm_gmtoff=yes

23727

else

23728

echo "$as_me: failed program was:" >&5

23729

@@ -29944,8 +28494,7 @@

23683

@@ -29943,27 +28527,10 @@

23684

rm -f conftest.er1

23685

cat conftest.err >&5

23686

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

23687

- (exit $ac_status); } &&

23688

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23689

- { (case "(($ac_try" in

23690

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

23691

- *) ac_try_echo=$ac_try;;

23692

-esac

23693

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

23694

- (eval "$ac_try") 2>&5

23695

- ac_status=$?

23696

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

23697

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

23698

- { ac_try='test -s conftest.$ac_objext'

23699

- { (case "(($ac_try" in

23700

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

23701

- *) ac_try_echo=$ac_try;;

23702

-esac

23703

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

23704

- (eval "$ac_try") 2>&5

23705

- ac_status=$?

23706

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

23707

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

23708

+ (exit $ac_status); } && {

23709

+ test -z "$ac_c_werror_flag" ||

23710

+ test ! -s conftest.err

23711

+ } && test -s conftest.$ac_objext; then

23712

ac_cv_member_struct_tm_tm_gmtoff=yes

23713

else

23714

echo "$as_me: failed program was:" >&5

23715

@@ -30000,27 +28567,10 @@

23716

rm -f conftest.er1

23717

cat conftest.err >&5

23718

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

23719

- (exit $ac_status); } &&

23720

- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

23721

- { (case "(($ac_try" in

23722

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

23723

- *) ac_try_echo=$ac_try;;

23724

-esac

23725

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

23726

- (eval "$ac_try") 2>&5

23727

- ac_status=$?

23728

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

23729

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

23730

- { ac_try='test -s conftest.$ac_objext'

23731

- { (case "(($ac_try" in

23732

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

23733

- *) ac_try_echo=$ac_try;;

23734

-esac

23735

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

23736

- (eval "$ac_try") 2>&5

23737

- ac_status=$?

23738

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

23739

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

23740

+ (exit $ac_status); } && {

23741

+ test -z "$ac_c_werror_flag" ||

23742

+ test ! -s conftest.err

23743

+ } && test -s conftest.$ac_objext; then

23744

ac_cv_member_struct_tm_tm_gmtoff=yes

23745

else

23746

echo "$as_me: failed program was:" >&5

23747

@@ -30070,8 +28620,7 @@

23730

23748

main ()

23731

23749

{

23732

23750

#ifndef timezone

23736

23754

#endif

23737

23755

23738

23756

;

23739

@@ -29965,27 +28514,10 @@

23757

@@ -30091,27 +28640,10 @@

23740

23758

rm -f conftest.er1

23741

23759

cat conftest.err >&5

23742

23760

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

23768

23786

ac_cv_have_decl_timezone=yes

23769

23787

else

23770

23788

echo "$as_me: failed program was:" >&5

23771

@@ -30042,27 +28574,11 @@

23789

@@ -30168,27 +28700,11 @@

23772

23790

rm -f conftest.er1

23773

23791

cat conftest.err >&5

23774

23792

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

23801

23819

gtk_ok=yes

23802

23820

else

23803

23821

echo "$as_me: failed program was:" >&5

23804

@@ -30071,7 +28587,7 @@

23822

@@ -30197,7 +28713,7 @@

23805

23823

gtk_ok=no

23806

23824

fi

23807

23825

23810

23828

conftest$ac_exeext conftest.$ac_ext

23811

23829

{ echo "$as_me:$LINENO: result: $gtk_ok" >&5

23812

23830

echo "${ECHO_T}$gtk_ok" >&6; }

23813

@@ -30279,7 +28795,7 @@

23814

23815

23816

23817

-ac_config_files="$ac_config_files gnome-applets.spec Makefile po/Makefile.in accessx-status/Makefile accessx-status/docs/Makefile accessx-status/pixmaps/Makefile mini-commander/Makefile mini-commander/src/Makefile mini-commander/help/Makefile mixer/Makefile mixer/docs/Makefile drivemount/Makefile drivemount/help/Makefile modemlights/Makefile multiload/Makefile multiload/docs/Makefile gkb-new/Makefile gkb-new/xmodmap/Makefile gkb-new/xmodmap.sun/Makefile charpick/Makefile charpick/help/Makefile invest-applet/Makefile invest-applet/invest/Makefile invest-applet/invest/defs.py invest-applet/data/Makefile invest-applet/data/art/Makefile libgweather/Makefile libgweather/gweather.pc gweather/Makefile gweather/docs/Makefile geyes/Makefile geyes/themes/Makefile geyes/docs/Makefile battstat/Makefile battstat/apmlib/Makefile battstat/sounds/Makefile battstat/docs/Makefile man/Makefile stickynotes/Makefile stickynotes/pixmaps/Makefile stickynotes/docs/Makefile stickynotes/data/Makefile gswitchit/Makefile gswitchit/help/Makefile trashapplet/Makefile trashapplet/src/Makefile trashapplet/docs/Makefile cpufreq/Makefile cpufreq/src/Makefile cpufreq/src/cpufreq-selector/Makefile cpufreq/pixmaps/Makefile cpufreq/help/Makefile null_applet/Makefile"

23818

+ac_config_files="$ac_config_files gnome-applets.spec Makefile po/Makefile.in po-locations/Makefile accessx-status/Makefile accessx-status/docs/Makefile accessx-status/pixmaps/Makefile mini-commander/Makefile mini-commander/src/Makefile mini-commander/help/Makefile mixer/Makefile mixer/docs/Makefile drivemount/Makefile drivemount/help/Makefile modemlights/Makefile multiload/Makefile multiload/docs/Makefile gkb-new/Makefile gkb-new/xmodmap/Makefile gkb-new/xmodmap.sun/Makefile charpick/Makefile charpick/help/Makefile invest-applet/Makefile invest-applet/invest/Makefile invest-applet/invest/defs.py invest-applet/data/Makefile invest-applet/data/art/Makefile libgweather/Makefile libgweather/gweather.pc gweather/Makefile gweather/docs/Makefile geyes/Makefile geyes/themes/Makefile geyes/docs/Makefile battstat/Makefile battstat/apmlib/Makefile battstat/sounds/Makefile battstat/docs/Makefile man/Makefile stickynotes/Makefile stickynotes/pixmaps/Makefile stickynotes/docs/Makefile stickynotes/data/Makefile gswitchit/Makefile gswitchit/help/Makefile trashapplet/Makefile trashapplet/src/Makefile trashapplet/docs/Makefile cpufreq/Makefile cpufreq/src/Makefile cpufreq/src/cpufreq-selector/Makefile cpufreq/pixmaps/Makefile cpufreq/help/Makefile null_applet/Makefile"

23819

23820

cat >confcache <<\_ACEOF

23821

# This file is a shell script that caches the results of configure

23822

@@ -30601,7 +29117,8 @@

23831

@@ -30727,7 +29243,8 @@

23823

23832

## M4sh Initialization. ##

23824

23833

## --------------------- ##

23825

23834

23829

23838

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

23830

23839

emulate sh

23831

23840

NULLCMD=:

23832

@@ -30610,10 +29127,13 @@

23841

@@ -30736,10 +29253,13 @@

23833

23842

alias -g '${1+"$@"}'='"$@"'

23834

23843

setopt NO_GLOB_SUBST

23835

23844

else

23846

23855

23847

23856

23848

23857

# PATH needs CR

23849

@@ -30837,19 +29357,28 @@

23858

@@ -30963,19 +29483,28 @@

23850

23859

as_mkdir_p=false

23851

23860

fi

23852

23861

23886

23895

23887

23896

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

23888

23897

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

23889

@@ -30865,7 +29394,7 @@

23898

@@ -30991,7 +29520,7 @@

23890

23899

# values after options handling.

23891

23900

ac_log="

23892

This file was extended by gnome-applets $as_me 2.21.2, which was

23901

This file was extended by gnome-applets $as_me 2.21.4, which was

23893

23902

-generated by GNU Autoconf 2.60. Invocation command line was

23894

23903

+generated by GNU Autoconf 2.61. Invocation command line was

23895

23904

23896

23905

CONFIG_FILES = $CONFIG_FILES

23897

23906

CONFIG_HEADERS = $CONFIG_HEADERS

23898

@@ -30894,7 +29423,7 @@

23907

@@ -31020,7 +29549,7 @@

23899

23908

Usage: $0 [OPTIONS] [FILE]...

23900

23909

23901

23910

-h, --help print this help, then exit

23904

23913

-q, --quiet do not print progress messages

23905

23914

-d, --debug don't remove temporary files

23906

23915

--recheck update $as_me by reconfiguring in the same conditions

23907

@@ -30918,7 +29447,7 @@

23916

@@ -31044,7 +29573,7 @@

23908

23917

cat >>$CONFIG_STATUS <<_ACEOF

23909

23918

ac_cs_version="\\

23910

gnome-applets config.status 2.21.2

23919

gnome-applets config.status 2.21.4

23911

23920

-configured by $0, generated by GNU Autoconf 2.60,

23912

23921

+configured by $0, generated by GNU Autoconf 2.61,

23913

23922

with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

23914

23923

23915

23924

23916

@@ -31042,6 +29571,7 @@

23917

"gnome-applets.spec") CONFIG_FILES="$CONFIG_FILES gnome-applets.spec" ;;

23918

"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

23919

"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;

23920

+ "po-locations/Makefile") CONFIG_FILES="$CONFIG_FILES po-locations/Makefile" ;;

23921

"accessx-status/Makefile") CONFIG_FILES="$CONFIG_FILES accessx-status/Makefile" ;;

23922

"accessx-status/docs/Makefile") CONFIG_FILES="$CONFIG_FILES accessx-status/docs/Makefile" ;;

23923

"accessx-status/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES accessx-status/pixmaps/Makefile" ;;

23924

@@ -31311,6 +29841,7 @@

23925

@@ -31435,6 +29964,7 @@

23925

23926

host_cpu!$host_cpu$ac_delim

23926

23927

host_vendor!$host_vendor$ac_delim

23927

23928

host_os!$host_os$ac_delim

23929

23930

LN_S!$LN_S$ac_delim

23930

23931

ECHO!$ECHO$ac_delim

23931

23932

AR!$AR$ac_delim

23932

@@ -31389,7 +29920,6 @@

23933

@@ -31513,7 +30043,6 @@

23933

23934

XML2_LIBS!$XML2_LIBS$ac_delim

23934

GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim

23935

GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim

23936

-GCONFTOOL!$GCONFTOOL$ac_delim

23935

LIBGWEATHER_CFLAGS!$LIBGWEATHER_CFLAGS$ac_delim

23936

LIBGWEATHER_LIBS!$LIBGWEATHER_LIBS$ac_delim

23937

-LIBGWEATHER_LOCATIONS!$LIBGWEATHER_LOCATIONS$ac_delim

23937

23938

_ACEOF

23938

23939

23940

if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

23940

@@ -31431,6 +29961,7 @@

23941

@@ -31555,6 +30084,7 @@

23941

23942

ac_delim='%!_!# '

23942

23943

for ac_last_try in false false false false false :; do

23943

23944

cat >conf$$subs.sed <<_ACEOF

23944

+GCONFTOOL!$GCONFTOOL$ac_delim

23945

XSLTPROC!$XSLTPROC$ac_delim

23946

SCROLLKEEPER_CONFIG!$SCROLLKEEPER_CONFIG$ac_delim

23947

SCROLLKEEPER_REQUIRED!$SCROLLKEEPER_REQUIRED$ac_delim

23948

@@ -31493,8 +30024,7 @@

23945

+LIBGWEATHER_LOCATIONS!$LIBGWEATHER_LOCATIONS$ac_delim

23946

GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim

23947

GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim

23948

GCONFTOOL!$GCONFTOOL$ac_delim

23949

@@ -31620,8 +30150,7 @@

23949

23950

HAVE_XKB!$HAVE_XKB$ac_delim

23950

23951

APPLET_ACCESSX_TRUE!$APPLET_ACCESSX_TRUE$ac_delim

23951

23952

APPLET_ACCESSX_FALSE!$APPLET_ACCESSX_FALSE$ac_delim

23955

23956

MODEMLIGHTS_LIBS!$MODEMLIGHTS_LIBS$ac_delim

23956

23957

APPLET_MODEMLIGHTS_TRUE!$APPLET_MODEMLIGHTS_TRUE$ac_delim

23957

23958

APPLET_MODEMLIGHTS_FALSE!$APPLET_MODEMLIGHTS_FALSE$ac_delim

23958

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/cpufreq/help/Makefile.in gnome-applets-2.21.2.new/cpufreq/help/Makefile.in

23959

--- gnome-applets-2.21.2/cpufreq/help/Makefile.in 2007-12-03 10:32:24.000000000 +0100

23960

+++ gnome-applets-2.21.2.new/cpufreq/help/Makefile.in 2007-12-03 10:33:58.000000000 +0100

23959

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/cpufreq/help/Makefile.in gnome-applets-2.21.4.new/cpufreq/help/Makefile.in

23960

--- gnome-applets-2.21.4/cpufreq/help/Makefile.in 2008-01-14 20:49:38.000000000 +0100

23961

+++ gnome-applets-2.21.4.new/cpufreq/help/Makefile.in 2008-01-15 15:34:42.000000000 +0100

23961

23962

@@ -62,7 +62,6 @@

23962

23963

$(top_srcdir)/m4/acinclude.m4 \

23963

23964

$(top_srcdir)/m4/gnome-doc-utils.m4 \

23966

23967

$(top_srcdir)/configure.in

23967

23968

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

23968

23969

$(ACLOCAL_M4)

23969

@@ -206,6 +205,7 @@

23970

@@ -209,6 +208,7 @@

23970

23971

MIXER_LIBS = @MIXER_LIBS@

23971

23972

MKDIR_P = @MKDIR_P@

23972

23973

MKINSTALLDIRS = @MKINSTALLDIRS@

23974

23975

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

23975

23976

MSGFMT = @MSGFMT@

23976

23977

MSGFMT_OPTS = @MSGFMT_OPTS@

23977

@@ -237,11 +237,10 @@

23978

@@ -240,11 +240,10 @@

23978

23979

RANLIB = @RANLIB@

23979

23980

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

23980

23981

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

23987

23988

SYSCONFDIR = @SYSCONFDIR@

23988

23989

USE_NLS = @USE_NLS@

23989

23990

VERSION = @VERSION@

23990

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/cpufreq/Makefile.in gnome-applets-2.21.2.new/cpufreq/Makefile.in

23991

--- gnome-applets-2.21.2/cpufreq/Makefile.in 2007-12-03 10:32:24.000000000 +0100

23992

+++ gnome-applets-2.21.2.new/cpufreq/Makefile.in 2007-12-03 10:33:58.000000000 +0100

23991

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/cpufreq/Makefile.in gnome-applets-2.21.4.new/cpufreq/Makefile.in

23992

--- gnome-applets-2.21.4/cpufreq/Makefile.in 2008-01-14 20:49:38.000000000 +0100

23993

+++ gnome-applets-2.21.4.new/cpufreq/Makefile.in 2008-01-15 15:34:42.000000000 +0100

23993

23994

@@ -39,7 +39,6 @@

23994

23995

$(top_srcdir)/m4/acinclude.m4 \

23995

23996

$(top_srcdir)/m4/gnome-doc-utils.m4 \

23998

23999

$(top_srcdir)/configure.in

23999

24000

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24000

24001

$(ACLOCAL_M4)

24001

@@ -208,6 +207,7 @@

24002

@@ -211,6 +210,7 @@

24002

24003

MIXER_LIBS = @MIXER_LIBS@

24003

24004

MKDIR_P = @MKDIR_P@

24004

24005

MKINSTALLDIRS = @MKINSTALLDIRS@

24006

24007

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24007

24008

MSGFMT = @MSGFMT@

24008

24009

MSGFMT_OPTS = @MSGFMT_OPTS@

24009

@@ -239,11 +239,10 @@

24010

@@ -242,11 +242,10 @@

24010

24011

RANLIB = @RANLIB@

24011

24012

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24012

24013

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24019

24020

SYSCONFDIR = @SYSCONFDIR@

24020

24021

USE_NLS = @USE_NLS@

24021

24022

VERSION = @VERSION@

24022

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/cpufreq/pixmaps/Makefile.in gnome-applets-2.21.2.new/cpufreq/pixmaps/Makefile.in

24023

--- gnome-applets-2.21.2/cpufreq/pixmaps/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24024

+++ gnome-applets-2.21.2.new/cpufreq/pixmaps/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24023

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/cpufreq/pixmaps/Makefile.in gnome-applets-2.21.4.new/cpufreq/pixmaps/Makefile.in

24024

--- gnome-applets-2.21.4/cpufreq/pixmaps/Makefile.in 2008-01-14 20:49:38.000000000 +0100

24025

+++ gnome-applets-2.21.4.new/cpufreq/pixmaps/Makefile.in 2008-01-15 15:34:42.000000000 +0100

24025

24026

@@ -38,7 +38,6 @@

24026

24027

$(top_srcdir)/m4/acinclude.m4 \

24027

24028

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24030

24031

$(top_srcdir)/configure.in

24031

24032

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24032

24033

$(ACLOCAL_M4)

24033

@@ -191,6 +190,7 @@

24034

MIXER_LIBS = @MIXER_LIBS@

24035

MKDIR_P = @MKDIR_P@

24036

MKINSTALLDIRS = @MKINSTALLDIRS@

24037

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24038

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24039

MSGFMT = @MSGFMT@

24040

MSGFMT_OPTS = @MSGFMT_OPTS@

24041

@@ -222,11 +222,10 @@

24042

RANLIB = @RANLIB@

24043

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24044

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24045

+SED = @SED@

24046

SET_MAKE = @SET_MAKE@

24047

SHELL = @SHELL@

24048

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24049

STRIP = @STRIP@

24050

-SU_TOOL = @SU_TOOL@

24051

SYSCONFDIR = @SYSCONFDIR@

24052

USE_NLS = @USE_NLS@

24053

VERSION = @VERSION@

24054

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.21.2.new/cpufreq/src/cpufreq-selector/Makefile.in

24055

--- gnome-applets-2.21.2/cpufreq/src/cpufreq-selector/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24056

+++ gnome-applets-2.21.2.new/cpufreq/src/cpufreq-selector/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24057

@@ -39,7 +39,6 @@

24058

$(top_srcdir)/m4/acinclude.m4 \

24059

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24060

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24061

- $(top_srcdir)/m4/system-tools-backends.m4 \

24062

$(top_srcdir)/configure.in

24063

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24064

$(ACLOCAL_M4)

24065

@@ -218,6 +217,7 @@

24066

MIXER_LIBS = @MIXER_LIBS@

24067

MKDIR_P = @MKDIR_P@

24068

MKINSTALLDIRS = @MKINSTALLDIRS@

24069

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24070

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24071

MSGFMT = @MSGFMT@

24072

MSGFMT_OPTS = @MSGFMT_OPTS@

24073

@@ -249,11 +249,10 @@

24074

RANLIB = @RANLIB@

24075

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24076

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24077

+SED = @SED@

24078

SET_MAKE = @SET_MAKE@

24079

SHELL = @SHELL@

24080

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24081

STRIP = @STRIP@

24082

-SU_TOOL = @SU_TOOL@

24083

SYSCONFDIR = @SYSCONFDIR@

24084

USE_NLS = @USE_NLS@

24085

VERSION = @VERSION@

24086

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/cpufreq/src/Makefile.in gnome-applets-2.21.2.new/cpufreq/src/Makefile.in

24087

--- gnome-applets-2.21.2/cpufreq/src/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24088

+++ gnome-applets-2.21.2.new/cpufreq/src/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24089

@@ -39,7 +39,6 @@

24090

$(top_srcdir)/m4/acinclude.m4 \

24091

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24092

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24093

- $(top_srcdir)/m4/system-tools-backends.m4 \

24094

$(top_srcdir)/configure.in

24095

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24096

$(ACLOCAL_M4)

24097

@@ -232,6 +231,7 @@

24098

MIXER_LIBS = @MIXER_LIBS@

24099

MKDIR_P = @MKDIR_P@

24100

MKINSTALLDIRS = @MKINSTALLDIRS@

24101

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24102

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24103

MSGFMT = @MSGFMT@

24104

MSGFMT_OPTS = @MSGFMT_OPTS@

24105

@@ -263,11 +263,10 @@

24106

RANLIB = @RANLIB@

24107

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24108

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24109

+SED = @SED@

24110

SET_MAKE = @SET_MAKE@

24111

SHELL = @SHELL@

24112

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24113

STRIP = @STRIP@

24114

-SU_TOOL = @SU_TOOL@

24115

SYSCONFDIR = @SYSCONFDIR@

24116

USE_NLS = @USE_NLS@

24117

VERSION = @VERSION@

24118

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/drivemount/help/Makefile.in gnome-applets-2.21.2.new/drivemount/help/Makefile.in

24119

--- gnome-applets-2.21.2/drivemount/help/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24120

+++ gnome-applets-2.21.2.new/drivemount/help/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24121

@@ -62,7 +62,6 @@

24122

$(top_srcdir)/m4/acinclude.m4 \

24123

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24124

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24125

- $(top_srcdir)/m4/system-tools-backends.m4 \

24126

$(top_srcdir)/configure.in

24127

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24128

$(ACLOCAL_M4)

24129

@@ -206,6 +205,7 @@

24130

MIXER_LIBS = @MIXER_LIBS@

24131

MKDIR_P = @MKDIR_P@

24132

MKINSTALLDIRS = @MKINSTALLDIRS@

24133

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24134

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24135

MSGFMT = @MSGFMT@

24136

MSGFMT_OPTS = @MSGFMT_OPTS@

24137

@@ -237,11 +237,10 @@

24138

RANLIB = @RANLIB@

24139

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24140

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24141

+SED = @SED@

24142

SET_MAKE = @SET_MAKE@

24143

SHELL = @SHELL@

24144

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24145

STRIP = @STRIP@

24146

-SU_TOOL = @SU_TOOL@

24147

SYSCONFDIR = @SYSCONFDIR@

24148

USE_NLS = @USE_NLS@

24149

VERSION = @VERSION@

24150

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/drivemount/Makefile.in gnome-applets-2.21.2.new/drivemount/Makefile.in

24151

--- gnome-applets-2.21.2/drivemount/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24152

+++ gnome-applets-2.21.2.new/drivemount/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24153

@@ -41,7 +41,6 @@

24154

$(top_srcdir)/m4/acinclude.m4 \

24155

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24156

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24157

- $(top_srcdir)/m4/system-tools-backends.m4 \

24158

$(top_srcdir)/configure.in

24159

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24160

$(ACLOCAL_M4)

24161

@@ -228,6 +227,7 @@

24162

MIXER_LIBS = @MIXER_LIBS@

24163

MKDIR_P = @MKDIR_P@

24164

MKINSTALLDIRS = @MKINSTALLDIRS@

24165

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24166

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24167

MSGFMT = @MSGFMT@

24168

MSGFMT_OPTS = @MSGFMT_OPTS@

24169

@@ -259,11 +259,10 @@

24170

RANLIB = @RANLIB@

24171

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24172

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24173

+SED = @SED@

24174

SET_MAKE = @SET_MAKE@

24175

SHELL = @SHELL@

24176

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24177

STRIP = @STRIP@

24178

-SU_TOOL = @SU_TOOL@

24179

SYSCONFDIR = @SYSCONFDIR@

24180

USE_NLS = @USE_NLS@

24181

VERSION = @VERSION@

24182

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/geyes/docs/Makefile.in gnome-applets-2.21.2.new/geyes/docs/Makefile.in

24183

--- gnome-applets-2.21.2/geyes/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24184

+++ gnome-applets-2.21.2.new/geyes/docs/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24185

@@ -62,7 +62,6 @@

24186

$(top_srcdir)/m4/acinclude.m4 \

24187

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24188

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24189

- $(top_srcdir)/m4/system-tools-backends.m4 \

24190

$(top_srcdir)/configure.in

24191

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24192

$(ACLOCAL_M4)

24193

@@ -206,6 +205,7 @@

24194

MIXER_LIBS = @MIXER_LIBS@

24195

MKDIR_P = @MKDIR_P@

24196

MKINSTALLDIRS = @MKINSTALLDIRS@

24197

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24198

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24199

MSGFMT = @MSGFMT@

24200

MSGFMT_OPTS = @MSGFMT_OPTS@

24201

@@ -237,11 +237,10 @@

24202

RANLIB = @RANLIB@

24203

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24204

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24205

+SED = @SED@

24206

SET_MAKE = @SET_MAKE@

24207

SHELL = @SHELL@

24208

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24209

STRIP = @STRIP@

24210

-SU_TOOL = @SU_TOOL@

24211

SYSCONFDIR = @SYSCONFDIR@

24212

USE_NLS = @USE_NLS@

24213

VERSION = @VERSION@

24214

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/geyes/Makefile.in gnome-applets-2.21.2.new/geyes/Makefile.in

24215

--- gnome-applets-2.21.2/geyes/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24216

+++ gnome-applets-2.21.2.new/geyes/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24217

@@ -41,7 +41,6 @@

24218

$(top_srcdir)/m4/acinclude.m4 \

24219

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24220

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24221

- $(top_srcdir)/m4/system-tools-backends.m4 \

24222

$(top_srcdir)/configure.in

24223

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24224

$(ACLOCAL_M4)

24225

@@ -227,6 +226,7 @@

24226

MIXER_LIBS = @MIXER_LIBS@

24227

MKDIR_P = @MKDIR_P@

24228

MKINSTALLDIRS = @MKINSTALLDIRS@

24229

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24230

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24231

MSGFMT = @MSGFMT@

24232

MSGFMT_OPTS = @MSGFMT_OPTS@

24233

@@ -258,11 +258,10 @@

24234

RANLIB = @RANLIB@

24235

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24236

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24237

+SED = @SED@

24238

SET_MAKE = @SET_MAKE@

24239

SHELL = @SHELL@

24240

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24241

STRIP = @STRIP@

24242

-SU_TOOL = @SU_TOOL@

24243

SYSCONFDIR = @SYSCONFDIR@

24244

USE_NLS = @USE_NLS@

24245

VERSION = @VERSION@

24246

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/geyes/themes/Makefile.in gnome-applets-2.21.2.new/geyes/themes/Makefile.in

24247

--- gnome-applets-2.21.2/geyes/themes/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24248

+++ gnome-applets-2.21.2.new/geyes/themes/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24034

@@ -194,6 +193,7 @@

24035

MIXER_LIBS = @MIXER_LIBS@

24036

MKDIR_P = @MKDIR_P@

24037

MKINSTALLDIRS = @MKINSTALLDIRS@

24038

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24039

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24040

MSGFMT = @MSGFMT@

24041

MSGFMT_OPTS = @MSGFMT_OPTS@

24042

@@ -225,11 +225,10 @@

24043

RANLIB = @RANLIB@

24044

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24045

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24046

+SED = @SED@

24047

SET_MAKE = @SET_MAKE@

24048

SHELL = @SHELL@

24049

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24050

STRIP = @STRIP@

24051

-SU_TOOL = @SU_TOOL@

24052

SYSCONFDIR = @SYSCONFDIR@

24053

USE_NLS = @USE_NLS@

24054

VERSION = @VERSION@

24055

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.21.4.new/cpufreq/src/cpufreq-selector/Makefile.in

24056

--- gnome-applets-2.21.4/cpufreq/src/cpufreq-selector/Makefile.in 2008-01-14 20:49:38.000000000 +0100

24057

+++ gnome-applets-2.21.4.new/cpufreq/src/cpufreq-selector/Makefile.in 2008-01-15 15:34:42.000000000 +0100

24058

@@ -39,7 +39,6 @@

24059

$(top_srcdir)/m4/acinclude.m4 \

24060

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24061

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24062

- $(top_srcdir)/m4/system-tools-backends.m4 \

24063

$(top_srcdir)/configure.in

24064

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24065

$(ACLOCAL_M4)

24066

@@ -221,6 +220,7 @@

24067

MIXER_LIBS = @MIXER_LIBS@

24068

MKDIR_P = @MKDIR_P@

24069

MKINSTALLDIRS = @MKINSTALLDIRS@

24070

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24071

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24072

MSGFMT = @MSGFMT@

24073

MSGFMT_OPTS = @MSGFMT_OPTS@

24074

@@ -252,11 +252,10 @@

24075

RANLIB = @RANLIB@

24076

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24077

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24078

+SED = @SED@

24079

SET_MAKE = @SET_MAKE@

24080

SHELL = @SHELL@

24081

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24082

STRIP = @STRIP@

24083

-SU_TOOL = @SU_TOOL@

24084

SYSCONFDIR = @SYSCONFDIR@

24085

USE_NLS = @USE_NLS@

24086

VERSION = @VERSION@

24087

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/cpufreq/src/Makefile.in gnome-applets-2.21.4.new/cpufreq/src/Makefile.in

24088

--- gnome-applets-2.21.4/cpufreq/src/Makefile.in 2008-01-14 20:49:38.000000000 +0100

24089

+++ gnome-applets-2.21.4.new/cpufreq/src/Makefile.in 2008-01-15 15:34:42.000000000 +0100

24090

@@ -39,7 +39,6 @@

24091

$(top_srcdir)/m4/acinclude.m4 \

24092

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24093

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24094

- $(top_srcdir)/m4/system-tools-backends.m4 \

24095

$(top_srcdir)/configure.in

24096

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24097

$(ACLOCAL_M4)

24098

@@ -235,6 +234,7 @@

24099

MIXER_LIBS = @MIXER_LIBS@

24100

MKDIR_P = @MKDIR_P@

24101

MKINSTALLDIRS = @MKINSTALLDIRS@

24102

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24103

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24104

MSGFMT = @MSGFMT@

24105

MSGFMT_OPTS = @MSGFMT_OPTS@

24106

@@ -266,11 +266,10 @@

24107

RANLIB = @RANLIB@

24108

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24109

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24110

+SED = @SED@

24111

SET_MAKE = @SET_MAKE@

24112

SHELL = @SHELL@

24113

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24114

STRIP = @STRIP@

24115

-SU_TOOL = @SU_TOOL@

24116

SYSCONFDIR = @SYSCONFDIR@

24117

USE_NLS = @USE_NLS@

24118

VERSION = @VERSION@

24119

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/drivemount/help/Makefile.in gnome-applets-2.21.4.new/drivemount/help/Makefile.in

24120

--- gnome-applets-2.21.4/drivemount/help/Makefile.in 2008-01-14 20:49:39.000000000 +0100

24121

+++ gnome-applets-2.21.4.new/drivemount/help/Makefile.in 2008-01-15 15:34:42.000000000 +0100

24122

@@ -62,7 +62,6 @@

24123

$(top_srcdir)/m4/acinclude.m4 \

24124

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24125

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24126

- $(top_srcdir)/m4/system-tools-backends.m4 \

24127

$(top_srcdir)/configure.in

24128

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24129

$(ACLOCAL_M4)

24130

@@ -209,6 +208,7 @@

24131

MIXER_LIBS = @MIXER_LIBS@

24132

MKDIR_P = @MKDIR_P@

24133

MKINSTALLDIRS = @MKINSTALLDIRS@

24134

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24135

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24136

MSGFMT = @MSGFMT@

24137

MSGFMT_OPTS = @MSGFMT_OPTS@

24138

@@ -240,11 +240,10 @@

24139

RANLIB = @RANLIB@

24140

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24141

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24142

+SED = @SED@

24143

SET_MAKE = @SET_MAKE@

24144

SHELL = @SHELL@

24145

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24146

STRIP = @STRIP@

24147

-SU_TOOL = @SU_TOOL@

24148

SYSCONFDIR = @SYSCONFDIR@

24149

USE_NLS = @USE_NLS@

24150

VERSION = @VERSION@

24151

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/drivemount/Makefile.in gnome-applets-2.21.4.new/drivemount/Makefile.in

24152

--- gnome-applets-2.21.4/drivemount/Makefile.in 2008-01-14 20:49:38.000000000 +0100

24153

+++ gnome-applets-2.21.4.new/drivemount/Makefile.in 2008-01-15 15:34:42.000000000 +0100

24154

@@ -41,7 +41,6 @@

24155

$(top_srcdir)/m4/acinclude.m4 \

24156

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24157

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24158

- $(top_srcdir)/m4/system-tools-backends.m4 \

24159

$(top_srcdir)/configure.in

24160

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24161

$(ACLOCAL_M4)

24162

@@ -231,6 +230,7 @@

24163

MIXER_LIBS = @MIXER_LIBS@

24164

MKDIR_P = @MKDIR_P@

24165

MKINSTALLDIRS = @MKINSTALLDIRS@

24166

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24167

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24168

MSGFMT = @MSGFMT@

24169

MSGFMT_OPTS = @MSGFMT_OPTS@

24170

@@ -262,11 +262,10 @@

24171

RANLIB = @RANLIB@

24172

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24173

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24174

+SED = @SED@

24175

SET_MAKE = @SET_MAKE@

24176

SHELL = @SHELL@

24177

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24178

STRIP = @STRIP@

24179

-SU_TOOL = @SU_TOOL@

24180

SYSCONFDIR = @SYSCONFDIR@

24181

USE_NLS = @USE_NLS@

24182

VERSION = @VERSION@

24183

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/geyes/docs/Makefile.in gnome-applets-2.21.4.new/geyes/docs/Makefile.in

24184

--- gnome-applets-2.21.4/geyes/docs/Makefile.in 2008-01-14 20:49:39.000000000 +0100

24185

+++ gnome-applets-2.21.4.new/geyes/docs/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24186

@@ -62,7 +62,6 @@

24187

$(top_srcdir)/m4/acinclude.m4 \

24188

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24189

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24190

- $(top_srcdir)/m4/system-tools-backends.m4 \

24191

$(top_srcdir)/configure.in

24192

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24193

$(ACLOCAL_M4)

24194

@@ -209,6 +208,7 @@

24195

MIXER_LIBS = @MIXER_LIBS@

24196

MKDIR_P = @MKDIR_P@

24197

MKINSTALLDIRS = @MKINSTALLDIRS@

24198

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24199

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24200

MSGFMT = @MSGFMT@

24201

MSGFMT_OPTS = @MSGFMT_OPTS@

24202

@@ -240,11 +240,10 @@

24203

RANLIB = @RANLIB@

24204

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24205

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24206

+SED = @SED@

24207

SET_MAKE = @SET_MAKE@

24208

SHELL = @SHELL@

24209

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24210

STRIP = @STRIP@

24211

-SU_TOOL = @SU_TOOL@

24212

SYSCONFDIR = @SYSCONFDIR@

24213

USE_NLS = @USE_NLS@

24214

VERSION = @VERSION@

24215

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/geyes/Makefile.in gnome-applets-2.21.4.new/geyes/Makefile.in

24216

--- gnome-applets-2.21.4/geyes/Makefile.in 2008-01-14 20:49:39.000000000 +0100

24217

+++ gnome-applets-2.21.4.new/geyes/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24218

@@ -41,7 +41,6 @@

24219

$(top_srcdir)/m4/acinclude.m4 \

24220

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24221

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24222

- $(top_srcdir)/m4/system-tools-backends.m4 \

24223

$(top_srcdir)/configure.in

24224

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24225

$(ACLOCAL_M4)

24226

@@ -230,6 +229,7 @@

24227

MIXER_LIBS = @MIXER_LIBS@

24228

MKDIR_P = @MKDIR_P@

24229

MKINSTALLDIRS = @MKINSTALLDIRS@

24230

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24231

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24232

MSGFMT = @MSGFMT@

24233

MSGFMT_OPTS = @MSGFMT_OPTS@

24234

@@ -261,11 +261,10 @@

24235

RANLIB = @RANLIB@

24236

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24237

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24238

+SED = @SED@

24239

SET_MAKE = @SET_MAKE@

24240

SHELL = @SHELL@

24241

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24242

STRIP = @STRIP@

24243

-SU_TOOL = @SU_TOOL@

24244

SYSCONFDIR = @SYSCONFDIR@

24245

USE_NLS = @USE_NLS@

24246

VERSION = @VERSION@

24247

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/geyes/themes/Makefile.in gnome-applets-2.21.4.new/geyes/themes/Makefile.in

24248

--- gnome-applets-2.21.4/geyes/themes/Makefile.in 2008-01-14 20:49:39.000000000 +0100

24249

+++ gnome-applets-2.21.4.new/geyes/themes/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24249

24250

@@ -40,7 +40,6 @@

24250

24251

$(top_srcdir)/m4/acinclude.m4 \

24251

24252

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24254

24255

$(top_srcdir)/configure.in

24255

24256

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24256

24257

$(ACLOCAL_M4)

24257

@@ -202,6 +201,7 @@

24258

MIXER_LIBS = @MIXER_LIBS@

24259

MKDIR_P = @MKDIR_P@

24260

MKINSTALLDIRS = @MKINSTALLDIRS@

24261

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24262

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24263

MSGFMT = @MSGFMT@

24264

MSGFMT_OPTS = @MSGFMT_OPTS@

24265

@@ -233,11 +233,10 @@

24266

RANLIB = @RANLIB@

24267

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24268

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24269

+SED = @SED@

24270

SET_MAKE = @SET_MAKE@

24271

SHELL = @SHELL@

24272

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24273

STRIP = @STRIP@

24274

-SU_TOOL = @SU_TOOL@

24275

SYSCONFDIR = @SYSCONFDIR@

24276

USE_NLS = @USE_NLS@

24277

VERSION = @VERSION@

24278

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/gkb-new/Makefile.in gnome-applets-2.21.2.new/gkb-new/Makefile.in

24279

--- gnome-applets-2.21.2/gkb-new/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24280

+++ gnome-applets-2.21.2.new/gkb-new/Makefile.in 2007-12-03 10:33:58.000000000 +0100

24281

@@ -38,7 +38,6 @@

24282

$(top_srcdir)/m4/acinclude.m4 \

24283

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24284

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24285

- $(top_srcdir)/m4/system-tools-backends.m4 \

24286

$(top_srcdir)/configure.in

24287

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24288

$(ACLOCAL_M4)

24289

@@ -194,6 +193,7 @@

24290

MIXER_LIBS = @MIXER_LIBS@

24291

MKDIR_P = @MKDIR_P@

24292

MKINSTALLDIRS = @MKINSTALLDIRS@

24293

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24294

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24295

MSGFMT = @MSGFMT@

24296

MSGFMT_OPTS = @MSGFMT_OPTS@

24297

@@ -225,11 +225,10 @@

24298

RANLIB = @RANLIB@

24299

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24300

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24301

+SED = @SED@

24302

SET_MAKE = @SET_MAKE@

24303

SHELL = @SHELL@

24304

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24305

STRIP = @STRIP@

24306

-SU_TOOL = @SU_TOOL@

24307

SYSCONFDIR = @SYSCONFDIR@

24308

USE_NLS = @USE_NLS@

24309

VERSION = @VERSION@

24310

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/gkb-new/xmodmap/Makefile.in gnome-applets-2.21.2.new/gkb-new/xmodmap/Makefile.in

24311

--- gnome-applets-2.21.2/gkb-new/xmodmap/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24312

+++ gnome-applets-2.21.2.new/gkb-new/xmodmap/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24313

@@ -38,7 +38,6 @@

24314

$(top_srcdir)/m4/acinclude.m4 \

24315

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24316

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24317

- $(top_srcdir)/m4/system-tools-backends.m4 \

24318

$(top_srcdir)/configure.in

24319

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24320

$(ACLOCAL_M4)

24321

@@ -191,6 +190,7 @@

24322

MIXER_LIBS = @MIXER_LIBS@

24323

MKDIR_P = @MKDIR_P@

24324

MKINSTALLDIRS = @MKINSTALLDIRS@

24325

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24326

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24327

MSGFMT = @MSGFMT@

24328

MSGFMT_OPTS = @MSGFMT_OPTS@

24329

@@ -222,11 +222,10 @@

24330

RANLIB = @RANLIB@

24331

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24332

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24333

+SED = @SED@

24334

SET_MAKE = @SET_MAKE@

24335

SHELL = @SHELL@

24336

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24337

STRIP = @STRIP@

24338

-SU_TOOL = @SU_TOOL@

24339

SYSCONFDIR = @SYSCONFDIR@

24340

USE_NLS = @USE_NLS@

24341

VERSION = @VERSION@

24342

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.21.2.new/gkb-new/xmodmap.sun/Makefile.in

24343

--- gnome-applets-2.21.2/gkb-new/xmodmap.sun/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24344

+++ gnome-applets-2.21.2.new/gkb-new/xmodmap.sun/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24345

@@ -38,7 +38,6 @@

24346

$(top_srcdir)/m4/acinclude.m4 \

24347

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24348

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24349

- $(top_srcdir)/m4/system-tools-backends.m4 \

24350

$(top_srcdir)/configure.in

24351

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24352

$(ACLOCAL_M4)

24353

@@ -191,6 +190,7 @@

24354

MIXER_LIBS = @MIXER_LIBS@

24355

MKDIR_P = @MKDIR_P@

24356

MKINSTALLDIRS = @MKINSTALLDIRS@

24357

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24358

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24359

MSGFMT = @MSGFMT@

24360

MSGFMT_OPTS = @MSGFMT_OPTS@

24361

@@ -222,11 +222,10 @@

24362

RANLIB = @RANLIB@

24363

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24364

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24365

+SED = @SED@

24366

SET_MAKE = @SET_MAKE@

24367

SHELL = @SHELL@

24368

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24369

STRIP = @STRIP@

24370

-SU_TOOL = @SU_TOOL@

24371

SYSCONFDIR = @SYSCONFDIR@

24372

USE_NLS = @USE_NLS@

24373

VERSION = @VERSION@

24374

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/gswitchit/help/Makefile.in gnome-applets-2.21.2.new/gswitchit/help/Makefile.in

24375

--- gnome-applets-2.21.2/gswitchit/help/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24376

+++ gnome-applets-2.21.2.new/gswitchit/help/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24377

@@ -62,7 +62,6 @@

24378

$(top_srcdir)/m4/acinclude.m4 \

24379

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24380

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24381

- $(top_srcdir)/m4/system-tools-backends.m4 \

24382

$(top_srcdir)/configure.in

24383

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24384

$(ACLOCAL_M4)

24385

@@ -206,6 +205,7 @@

24386

MIXER_LIBS = @MIXER_LIBS@

24387

MKDIR_P = @MKDIR_P@

24388

MKINSTALLDIRS = @MKINSTALLDIRS@

24389

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24390

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24391

MSGFMT = @MSGFMT@

24392

MSGFMT_OPTS = @MSGFMT_OPTS@

24393

@@ -237,11 +237,10 @@

24394

RANLIB = @RANLIB@

24395

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24396

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24397

+SED = @SED@

24398

SET_MAKE = @SET_MAKE@

24399

SHELL = @SHELL@

24400

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24401

STRIP = @STRIP@

24402

-SU_TOOL = @SU_TOOL@

24403

SYSCONFDIR = @SYSCONFDIR@

24404

USE_NLS = @USE_NLS@

24405

VERSION = @VERSION@

24406

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/gswitchit/Makefile.in gnome-applets-2.21.2.new/gswitchit/Makefile.in

24407

--- gnome-applets-2.21.2/gswitchit/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24408

+++ gnome-applets-2.21.2.new/gswitchit/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24409

@@ -41,7 +41,6 @@

24410

$(top_srcdir)/m4/acinclude.m4 \

24411

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24412

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24413

- $(top_srcdir)/m4/system-tools-backends.m4 \

24414

$(top_srcdir)/configure.in

24415

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24416

$(ACLOCAL_M4)

24417

@@ -246,6 +245,7 @@

24418

MIXER_LIBS = @MIXER_LIBS@

24419

MKDIR_P = @MKDIR_P@

24420

MKINSTALLDIRS = @MKINSTALLDIRS@

24421

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24422

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24423

MSGFMT = @MSGFMT@

24424

MSGFMT_OPTS = @MSGFMT_OPTS@

24425

@@ -277,11 +277,10 @@

24426

RANLIB = @RANLIB@

24427

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24428

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24429

+SED = @SED@

24430

SET_MAKE = @SET_MAKE@

24431

SHELL = @SHELL@

24432

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24433

STRIP = @STRIP@

24434

-SU_TOOL = @SU_TOOL@

24435

SYSCONFDIR = @SYSCONFDIR@

24436

USE_NLS = @USE_NLS@

24437

VERSION = @VERSION@

24438

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/gweather/docs/Makefile.in gnome-applets-2.21.2.new/gweather/docs/Makefile.in

24439

--- gnome-applets-2.21.2/gweather/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24440

+++ gnome-applets-2.21.2.new/gweather/docs/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24441

@@ -62,7 +62,6 @@

24442

$(top_srcdir)/m4/acinclude.m4 \

24443

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24444

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24445

- $(top_srcdir)/m4/system-tools-backends.m4 \

24446

$(top_srcdir)/configure.in

24447

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24448

$(ACLOCAL_M4)

24449

@@ -206,6 +205,7 @@

24450

MIXER_LIBS = @MIXER_LIBS@

24451

MKDIR_P = @MKDIR_P@

24452

MKINSTALLDIRS = @MKINSTALLDIRS@

24453

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24454

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24455

MSGFMT = @MSGFMT@

24456

MSGFMT_OPTS = @MSGFMT_OPTS@

24457

@@ -237,11 +237,10 @@

24458

RANLIB = @RANLIB@

24459

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24460

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24461

+SED = @SED@

24462

SET_MAKE = @SET_MAKE@

24463

SHELL = @SHELL@

24464

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24465

STRIP = @STRIP@

24466

-SU_TOOL = @SU_TOOL@

24467

SYSCONFDIR = @SYSCONFDIR@

24468

USE_NLS = @USE_NLS@

24469

VERSION = @VERSION@

24470

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/gweather/Makefile.in gnome-applets-2.21.2.new/gweather/Makefile.in

24471

--- gnome-applets-2.21.2/gweather/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24472

+++ gnome-applets-2.21.2.new/gweather/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24473

@@ -34,14 +34,13 @@

24474

host_triplet = @host@

24475

libexec_PROGRAMS = gweather-applet-2$(EXEEXT)

24476

subdir = gweather

24477

-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS \

24478

- ChangeLog

24479

+DIST_COMMON = $(dist_gweatherlocations_DATA) $(srcdir)/Makefile.am \

24480

+ $(srcdir)/Makefile.in AUTHORS ChangeLog

24481

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

24482

am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \

24483

$(top_srcdir)/m4/acinclude.m4 \

24484

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24485

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24486

- $(top_srcdir)/m4/system-tools-backends.m4 \

24487

$(top_srcdir)/configure.in

24488

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24489

$(ACLOCAL_M4)

24490

@@ -88,10 +87,10 @@

24491

*) f=$$p;; \

24492

esac;

24493

am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

24494

-gweatherlocationsDATA_INSTALL = $(INSTALL_DATA)

24495

+dist_gweatherlocationsDATA_INSTALL = $(INSTALL_DATA)

24496

serverDATA_INSTALL = $(INSTALL_DATA)

24497

uiDATA_INSTALL = $(INSTALL_DATA)

24498

-DATA = $(gweatherlocations_DATA) $(server_DATA) $(ui_DATA)

24499

+DATA = $(dist_gweatherlocations_DATA) $(server_DATA) $(ui_DATA)

24500

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

24501

distclean-recursive maintainer-clean-recursive

24502

ETAGS = etags

24503

@@ -232,6 +231,7 @@

24504

MIXER_LIBS = @MIXER_LIBS@

24505

MKDIR_P = @MKDIR_P@

24506

MKINSTALLDIRS = @MKINSTALLDIRS@

24507

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24508

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24509

MSGFMT = @MSGFMT@

24510

MSGFMT_OPTS = @MSGFMT_OPTS@

24511

@@ -263,11 +263,10 @@

24512

RANLIB = @RANLIB@

24513

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24514

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24515

+SED = @SED@

24516

SET_MAKE = @SET_MAKE@

24517

SHELL = @SHELL@

24518

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24519

STRIP = @STRIP@

24520

-SU_TOOL = @SU_TOOL@

24521

SYSCONFDIR = @SYSCONFDIR@

24522

USE_NLS = @USE_NLS@

24523

VERSION = @VERSION@

24524

@@ -375,12 +374,11 @@

24525

CLEANFILES = $(server_in_files) $(server_DATA)

24526

gweatherlocationsdir = $(pkgdatadir)/gweather

24527

gweatherlocations_in_files = Locations.xml.in

24528

-gweatherlocations_DATA = $(gweatherlocations_in_files:.xml.in=.xml) locations.dtd

24529

+dist_gweatherlocations_DATA = $(gweatherlocations_in_files:.xml.in=.xml) locations.dtd

24530

EXTRA_DIST = \

24531

GNOME_GWeatherApplet_Factory.server.in.in \

24532

- $(ui_DATA) \

24533

- Locations.xml \

24534

- locations.dtd

24535

+ $(ui_DATA) \

24536

+ Locations.xml.in

24537

24538

all: all-recursive

24539

24540

@@ -486,19 +484,19 @@

24541

24542

clean-libtool:

24543

-rm -rf .libs _libs

24544

-install-gweatherlocationsDATA: $(gweatherlocations_DATA)

24545

+install-dist_gweatherlocationsDATA: $(dist_gweatherlocations_DATA)

24546

@$(NORMAL_INSTALL)

24547

test -z "$(gweatherlocationsdir)" || $(MKDIR_P) "$(DESTDIR)$(gweatherlocationsdir)"

24548

- @list='$(gweatherlocations_DATA)'; for p in $$list; do \

24549

+ @list='$(dist_gweatherlocations_DATA)'; for p in $$list; do \

24550

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

24551

f=$(am__strip_dir) \

24552

- echo " $(gweatherlocationsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gweatherlocationsdir)/$$f'"; \

24553

- $(gweatherlocationsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gweatherlocationsdir)/$$f"; \

24554

+ echo " $(dist_gweatherlocationsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gweatherlocationsdir)/$$f'"; \

24555

+ $(dist_gweatherlocationsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gweatherlocationsdir)/$$f"; \

24556

done

24557

24558

-uninstall-gweatherlocationsDATA:

24559

+uninstall-dist_gweatherlocationsDATA:

24560

@$(NORMAL_UNINSTALL)

24561

- @list='$(gweatherlocations_DATA)'; for p in $$list; do \

24562

+ @list='$(dist_gweatherlocations_DATA)'; for p in $$list; do \

24563

f=$(am__strip_dir) \

24564

echo " rm -f '$(DESTDIR)$(gweatherlocationsdir)/$$f'"; \

24565

rm -f "$(DESTDIR)$(gweatherlocationsdir)/$$f"; \

24566

@@ -766,7 +764,7 @@

24567

24568

info-am:

24569

24570

-install-data-am: install-gweatherlocationsDATA install-serverDATA \

24571

+install-data-am: install-dist_gweatherlocationsDATA install-serverDATA \

24572

install-uiDATA

24573

24574

install-dvi: install-dvi-recursive

24575

@@ -803,7 +801,7 @@

24576

24577

ps-am:

24578

24579

-uninstall-am: uninstall-gweatherlocationsDATA \

24580

+uninstall-am: uninstall-dist_gweatherlocationsDATA \

24581

uninstall-libexecPROGRAMS uninstall-serverDATA \

24582

uninstall-uiDATA

24583

24584

@@ -816,8 +814,8 @@

24585

distclean distclean-compile distclean-generic \

24586

distclean-libtool distclean-tags distdir dvi dvi-am html \

24587

html-am info info-am install install-am install-data \

24588

- install-data-am install-dvi install-dvi-am install-exec \

24589

- install-exec-am install-gweatherlocationsDATA install-html \

24590

+ install-data-am install-dist_gweatherlocationsDATA install-dvi \

24591

+ install-dvi-am install-exec install-exec-am install-html \

24592

install-html-am install-info install-info-am \

24593

install-libexecPROGRAMS install-man install-pdf install-pdf-am \

24594

install-ps install-ps-am install-serverDATA install-strip \

24595

@@ -825,14 +823,16 @@

24596

installdirs-am maintainer-clean maintainer-clean-generic \

24597

mostlyclean mostlyclean-compile mostlyclean-generic \

24598

mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

24599

- uninstall uninstall-am uninstall-gweatherlocationsDATA \

24600

+ uninstall uninstall-am uninstall-dist_gweatherlocationsDATA \

24601

uninstall-libexecPROGRAMS uninstall-serverDATA \

24602

uninstall-uiDATA

24603

24604

24605

$(server_in_files): $(server_in_files:.server.in=.server.in.in)

24606

sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@

24607

-%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-locations/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $@

24608

+

24609

+%.xml: %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)

24610

+ LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $@

24611

24612

@INTLTOOL_SERVER_RULE@

24613

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

24614

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/invest-applet/data/art/Makefile.in gnome-applets-2.21.2.new/invest-applet/data/art/Makefile.in

24615

--- gnome-applets-2.21.2/invest-applet/data/art/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24616

+++ gnome-applets-2.21.2.new/invest-applet/data/art/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24617

@@ -38,7 +38,6 @@

24618

$(top_srcdir)/m4/acinclude.m4 \

24619

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24620

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24621

- $(top_srcdir)/m4/system-tools-backends.m4 \

24622

$(top_srcdir)/configure.in

24623

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24624

$(ACLOCAL_M4)

24625

@@ -192,6 +191,7 @@

24626

MIXER_LIBS = @MIXER_LIBS@

24627

MKDIR_P = @MKDIR_P@

24628

MKINSTALLDIRS = @MKINSTALLDIRS@

24629

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24630

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24631

MSGFMT = @MSGFMT@

24632

MSGFMT_OPTS = @MSGFMT_OPTS@

24633

@@ -223,11 +223,10 @@

24634

RANLIB = @RANLIB@

24635

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24636

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24637

+SED = @SED@

24638

SET_MAKE = @SET_MAKE@

24639

SHELL = @SHELL@

24640

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24641

STRIP = @STRIP@

24642

-SU_TOOL = @SU_TOOL@

24643

SYSCONFDIR = @SYSCONFDIR@

24644

USE_NLS = @USE_NLS@

24645

VERSION = @VERSION@

24646

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/invest-applet/data/Makefile.in gnome-applets-2.21.2.new/invest-applet/data/Makefile.in

24647

--- gnome-applets-2.21.2/invest-applet/data/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24648

+++ gnome-applets-2.21.2.new/invest-applet/data/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24649

@@ -38,7 +38,6 @@

24650

$(top_srcdir)/m4/acinclude.m4 \

24651

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24652

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24653

- $(top_srcdir)/m4/system-tools-backends.m4 \

24654

$(top_srcdir)/configure.in

24655

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24656

$(ACLOCAL_M4)

24657

@@ -206,6 +205,7 @@

24658

MIXER_LIBS = @MIXER_LIBS@

24659

MKDIR_P = @MKDIR_P@

24660

MKINSTALLDIRS = @MKINSTALLDIRS@

24661

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24662

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24663

MSGFMT = @MSGFMT@

24664

MSGFMT_OPTS = @MSGFMT_OPTS@

24665

@@ -237,11 +237,10 @@

24666

RANLIB = @RANLIB@

24667

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24668

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24669

+SED = @SED@

24670

SET_MAKE = @SET_MAKE@

24671

SHELL = @SHELL@

24672

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24673

STRIP = @STRIP@

24674

-SU_TOOL = @SU_TOOL@

24675

SYSCONFDIR = @SYSCONFDIR@

24676

USE_NLS = @USE_NLS@

24677

VERSION = @VERSION@

24678

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/invest-applet/invest/Makefile.in gnome-applets-2.21.2.new/invest-applet/invest/Makefile.in

24679

--- gnome-applets-2.21.2/invest-applet/invest/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24680

+++ gnome-applets-2.21.2.new/invest-applet/invest/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24258

@@ -205,6 +204,7 @@

24259

MIXER_LIBS = @MIXER_LIBS@

24260

MKDIR_P = @MKDIR_P@

24261

MKINSTALLDIRS = @MKINSTALLDIRS@

24262

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24263

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24264

MSGFMT = @MSGFMT@

24265

MSGFMT_OPTS = @MSGFMT_OPTS@

24266

@@ -236,11 +236,10 @@

24267

RANLIB = @RANLIB@

24268

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24269

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24270

+SED = @SED@

24271

SET_MAKE = @SET_MAKE@

24272

SHELL = @SHELL@

24273

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24274

STRIP = @STRIP@

24275

-SU_TOOL = @SU_TOOL@

24276

SYSCONFDIR = @SYSCONFDIR@

24277

USE_NLS = @USE_NLS@

24278

VERSION = @VERSION@

24279

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/gkb-new/Makefile.in gnome-applets-2.21.4.new/gkb-new/Makefile.in

24280

--- gnome-applets-2.21.4/gkb-new/Makefile.in 2008-01-14 20:49:39.000000000 +0100

24281

+++ gnome-applets-2.21.4.new/gkb-new/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24282

@@ -38,7 +38,6 @@

24283

$(top_srcdir)/m4/acinclude.m4 \

24284

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24285

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24286

- $(top_srcdir)/m4/system-tools-backends.m4 \

24287

$(top_srcdir)/configure.in

24288

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24289

$(ACLOCAL_M4)

24290

@@ -197,6 +196,7 @@

24291

MIXER_LIBS = @MIXER_LIBS@

24292

MKDIR_P = @MKDIR_P@

24293

MKINSTALLDIRS = @MKINSTALLDIRS@

24294

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24295

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24296

MSGFMT = @MSGFMT@

24297

MSGFMT_OPTS = @MSGFMT_OPTS@

24298

@@ -228,11 +228,10 @@

24299

RANLIB = @RANLIB@

24300

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24301

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24302

+SED = @SED@

24303

SET_MAKE = @SET_MAKE@

24304

SHELL = @SHELL@

24305

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24306

STRIP = @STRIP@

24307

-SU_TOOL = @SU_TOOL@

24308

SYSCONFDIR = @SYSCONFDIR@

24309

USE_NLS = @USE_NLS@

24310

VERSION = @VERSION@

24311

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/gkb-new/xmodmap/Makefile.in gnome-applets-2.21.4.new/gkb-new/xmodmap/Makefile.in

24312

--- gnome-applets-2.21.4/gkb-new/xmodmap/Makefile.in 2008-01-14 20:49:39.000000000 +0100

24313

+++ gnome-applets-2.21.4.new/gkb-new/xmodmap/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24314

@@ -38,7 +38,6 @@

24315

$(top_srcdir)/m4/acinclude.m4 \

24316

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24317

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24318

- $(top_srcdir)/m4/system-tools-backends.m4 \

24319

$(top_srcdir)/configure.in

24320

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24321

$(ACLOCAL_M4)

24322

@@ -194,6 +193,7 @@

24323

MIXER_LIBS = @MIXER_LIBS@

24324

MKDIR_P = @MKDIR_P@

24325

MKINSTALLDIRS = @MKINSTALLDIRS@

24326

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24327

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24328

MSGFMT = @MSGFMT@

24329

MSGFMT_OPTS = @MSGFMT_OPTS@

24330

@@ -225,11 +225,10 @@

24331

RANLIB = @RANLIB@

24332

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24333

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24334

+SED = @SED@

24335

SET_MAKE = @SET_MAKE@

24336

SHELL = @SHELL@

24337

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24338

STRIP = @STRIP@

24339

-SU_TOOL = @SU_TOOL@

24340

SYSCONFDIR = @SYSCONFDIR@

24341

USE_NLS = @USE_NLS@

24342

VERSION = @VERSION@

24343

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.21.4.new/gkb-new/xmodmap.sun/Makefile.in

24344

--- gnome-applets-2.21.4/gkb-new/xmodmap.sun/Makefile.in 2008-01-14 20:49:39.000000000 +0100

24345

+++ gnome-applets-2.21.4.new/gkb-new/xmodmap.sun/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24346

@@ -38,7 +38,6 @@

24347

$(top_srcdir)/m4/acinclude.m4 \

24348

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24349

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24350

- $(top_srcdir)/m4/system-tools-backends.m4 \

24351

$(top_srcdir)/configure.in

24352

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24353

$(ACLOCAL_M4)

24354

@@ -194,6 +193,7 @@

24355

MIXER_LIBS = @MIXER_LIBS@

24356

MKDIR_P = @MKDIR_P@

24357

MKINSTALLDIRS = @MKINSTALLDIRS@

24358

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24359

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24360

MSGFMT = @MSGFMT@

24361

MSGFMT_OPTS = @MSGFMT_OPTS@

24362

@@ -225,11 +225,10 @@

24363

RANLIB = @RANLIB@

24364

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24365

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24366

+SED = @SED@

24367

SET_MAKE = @SET_MAKE@

24368

SHELL = @SHELL@

24369

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24370

STRIP = @STRIP@

24371

-SU_TOOL = @SU_TOOL@

24372

SYSCONFDIR = @SYSCONFDIR@

24373

USE_NLS = @USE_NLS@

24374

VERSION = @VERSION@

24375

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/gswitchit/help/Makefile.in gnome-applets-2.21.4.new/gswitchit/help/Makefile.in

24376

--- gnome-applets-2.21.4/gswitchit/help/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24377

+++ gnome-applets-2.21.4.new/gswitchit/help/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24378

@@ -62,7 +62,6 @@

24379

$(top_srcdir)/m4/acinclude.m4 \

24380

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24381

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24382

- $(top_srcdir)/m4/system-tools-backends.m4 \

24383

$(top_srcdir)/configure.in

24384

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24385

$(ACLOCAL_M4)

24386

@@ -209,6 +208,7 @@

24387

MIXER_LIBS = @MIXER_LIBS@

24388

MKDIR_P = @MKDIR_P@

24389

MKINSTALLDIRS = @MKINSTALLDIRS@

24390

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24391

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24392

MSGFMT = @MSGFMT@

24393

MSGFMT_OPTS = @MSGFMT_OPTS@

24394

@@ -240,11 +240,10 @@

24395

RANLIB = @RANLIB@

24396

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24397

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24398

+SED = @SED@

24399

SET_MAKE = @SET_MAKE@

24400

SHELL = @SHELL@

24401

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24402

STRIP = @STRIP@

24403

-SU_TOOL = @SU_TOOL@

24404

SYSCONFDIR = @SYSCONFDIR@

24405

USE_NLS = @USE_NLS@

24406

VERSION = @VERSION@

24407

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/gswitchit/Makefile.in gnome-applets-2.21.4.new/gswitchit/Makefile.in

24408

--- gnome-applets-2.21.4/gswitchit/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24409

+++ gnome-applets-2.21.4.new/gswitchit/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24410

@@ -41,7 +41,6 @@

24411

$(top_srcdir)/m4/acinclude.m4 \

24412

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24413

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24414

- $(top_srcdir)/m4/system-tools-backends.m4 \

24415

$(top_srcdir)/configure.in

24416

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24417

$(ACLOCAL_M4)

24418

@@ -249,6 +248,7 @@

24419

MIXER_LIBS = @MIXER_LIBS@

24420

MKDIR_P = @MKDIR_P@

24421

MKINSTALLDIRS = @MKINSTALLDIRS@

24422

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24423

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24424

MSGFMT = @MSGFMT@

24425

MSGFMT_OPTS = @MSGFMT_OPTS@

24426

@@ -280,11 +280,10 @@

24427

RANLIB = @RANLIB@

24428

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24429

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24430

+SED = @SED@

24431

SET_MAKE = @SET_MAKE@

24432

SHELL = @SHELL@

24433

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24434

STRIP = @STRIP@

24435

-SU_TOOL = @SU_TOOL@

24436

SYSCONFDIR = @SYSCONFDIR@

24437

USE_NLS = @USE_NLS@

24438

VERSION = @VERSION@

24439

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/gweather/docs/Makefile.in gnome-applets-2.21.4.new/gweather/docs/Makefile.in

24440

--- gnome-applets-2.21.4/gweather/docs/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24441

+++ gnome-applets-2.21.4.new/gweather/docs/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24442

@@ -62,7 +62,6 @@

24443

$(top_srcdir)/m4/acinclude.m4 \

24444

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24445

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24446

- $(top_srcdir)/m4/system-tools-backends.m4 \

24447

$(top_srcdir)/configure.in

24448

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24449

$(ACLOCAL_M4)

24450

@@ -209,6 +208,7 @@

24451

MIXER_LIBS = @MIXER_LIBS@

24452

MKDIR_P = @MKDIR_P@

24453

MKINSTALLDIRS = @MKINSTALLDIRS@

24454

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24455

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24456

MSGFMT = @MSGFMT@

24457

MSGFMT_OPTS = @MSGFMT_OPTS@

24458

@@ -240,11 +240,10 @@

24459

RANLIB = @RANLIB@

24460

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24461

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24462

+SED = @SED@

24463

SET_MAKE = @SET_MAKE@

24464

SHELL = @SHELL@

24465

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24466

STRIP = @STRIP@

24467

-SU_TOOL = @SU_TOOL@

24468

SYSCONFDIR = @SYSCONFDIR@

24469

USE_NLS = @USE_NLS@

24470

VERSION = @VERSION@

24471

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/gweather/Makefile.in gnome-applets-2.21.4.new/gweather/Makefile.in

24472

--- gnome-applets-2.21.4/gweather/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24473

+++ gnome-applets-2.21.4.new/gweather/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24474

@@ -41,7 +41,6 @@

24475

$(top_srcdir)/m4/acinclude.m4 \

24476

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24477

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24478

- $(top_srcdir)/m4/system-tools-backends.m4 \

24479

$(top_srcdir)/configure.in

24480

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24481

$(ACLOCAL_M4)

24482

@@ -233,6 +232,7 @@

24483

MIXER_LIBS = @MIXER_LIBS@

24484

MKDIR_P = @MKDIR_P@

24485

MKINSTALLDIRS = @MKINSTALLDIRS@

24486

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24487

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24488

MSGFMT = @MSGFMT@

24489

MSGFMT_OPTS = @MSGFMT_OPTS@

24490

@@ -264,11 +264,10 @@

24491

RANLIB = @RANLIB@

24492

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24493

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24494

+SED = @SED@

24495

SET_MAKE = @SET_MAKE@

24496

SHELL = @SHELL@

24497

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24498

STRIP = @STRIP@

24499

-SU_TOOL = @SU_TOOL@

24500

SYSCONFDIR = @SYSCONFDIR@

24501

USE_NLS = @USE_NLS@

24502

VERSION = @VERSION@

24503

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/invest-applet/data/art/Makefile.in gnome-applets-2.21.4.new/invest-applet/data/art/Makefile.in

24504

--- gnome-applets-2.21.4/invest-applet/data/art/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24505

+++ gnome-applets-2.21.4.new/invest-applet/data/art/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24506

@@ -38,7 +38,6 @@

24507

$(top_srcdir)/m4/acinclude.m4 \

24508

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24509

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24510

- $(top_srcdir)/m4/system-tools-backends.m4 \

24511

$(top_srcdir)/configure.in

24512

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24513

$(ACLOCAL_M4)

24514

@@ -195,6 +194,7 @@

24515

MIXER_LIBS = @MIXER_LIBS@

24516

MKDIR_P = @MKDIR_P@

24517

MKINSTALLDIRS = @MKINSTALLDIRS@

24518

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24519

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24520

MSGFMT = @MSGFMT@

24521

MSGFMT_OPTS = @MSGFMT_OPTS@

24522

@@ -226,11 +226,10 @@

24523

RANLIB = @RANLIB@

24524

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24525

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24526

+SED = @SED@

24527

SET_MAKE = @SET_MAKE@

24528

SHELL = @SHELL@

24529

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24530

STRIP = @STRIP@

24531

-SU_TOOL = @SU_TOOL@

24532

SYSCONFDIR = @SYSCONFDIR@

24533

USE_NLS = @USE_NLS@

24534

VERSION = @VERSION@

24535

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/invest-applet/data/Makefile.in gnome-applets-2.21.4.new/invest-applet/data/Makefile.in

24536

--- gnome-applets-2.21.4/invest-applet/data/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24537

+++ gnome-applets-2.21.4.new/invest-applet/data/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24538

@@ -38,7 +38,6 @@

24539

$(top_srcdir)/m4/acinclude.m4 \

24540

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24541

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24542

- $(top_srcdir)/m4/system-tools-backends.m4 \

24543

$(top_srcdir)/configure.in

24544

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24545

$(ACLOCAL_M4)

24546

@@ -209,6 +208,7 @@

24547

MIXER_LIBS = @MIXER_LIBS@

24548

MKDIR_P = @MKDIR_P@

24549

MKINSTALLDIRS = @MKINSTALLDIRS@

24550

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24551

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24552

MSGFMT = @MSGFMT@

24553

MSGFMT_OPTS = @MSGFMT_OPTS@

24554

@@ -240,11 +240,10 @@

24555

RANLIB = @RANLIB@

24556

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24557

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24558

+SED = @SED@

24559

SET_MAKE = @SET_MAKE@

24560

SHELL = @SHELL@

24561

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24562

STRIP = @STRIP@

24563

-SU_TOOL = @SU_TOOL@

24564

SYSCONFDIR = @SYSCONFDIR@

24565

USE_NLS = @USE_NLS@

24566

VERSION = @VERSION@

24567

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/invest-applet/invest/Makefile.in gnome-applets-2.21.4.new/invest-applet/invest/Makefile.in

24568

--- gnome-applets-2.21.4/invest-applet/invest/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24569

+++ gnome-applets-2.21.4.new/invest-applet/invest/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24681

24570

@@ -39,7 +39,6 @@

24682

24571

$(top_srcdir)/m4/acinclude.m4 \

24683

24572

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24686

24575

$(top_srcdir)/configure.in

24687

24576

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24688

24577

$(ACLOCAL_M4)

24578

@@ -199,6 +198,7 @@

24579

MIXER_LIBS = @MIXER_LIBS@

24580

MKDIR_P = @MKDIR_P@

24581

MKINSTALLDIRS = @MKINSTALLDIRS@

24582

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24583

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24584

MSGFMT = @MSGFMT@

24585

MSGFMT_OPTS = @MSGFMT_OPTS@

24586

@@ -230,11 +230,10 @@

24587

RANLIB = @RANLIB@

24588

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24589

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24590

+SED = @SED@

24591

SET_MAKE = @SET_MAKE@

24592

SHELL = @SHELL@

24593

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24594

STRIP = @STRIP@

24595

-SU_TOOL = @SU_TOOL@

24596

SYSCONFDIR = @SYSCONFDIR@

24597

USE_NLS = @USE_NLS@

24598

VERSION = @VERSION@

24599

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/invest-applet/Makefile.in gnome-applets-2.21.4.new/invest-applet/Makefile.in

24600

--- gnome-applets-2.21.4/invest-applet/Makefile.in 2008-01-14 20:49:40.000000000 +0100

24601

+++ gnome-applets-2.21.4.new/invest-applet/Makefile.in 2008-01-15 15:34:43.000000000 +0100

24602

@@ -37,7 +37,6 @@

24603

$(top_srcdir)/m4/acinclude.m4 \

24604

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24605

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24606

- $(top_srcdir)/m4/system-tools-backends.m4 \

24607

$(top_srcdir)/configure.in

24608

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24609

$(ACLOCAL_M4)

24689

24610

@@ -196,6 +195,7 @@

24690

24611

MIXER_LIBS = @MIXER_LIBS@

24691

24612

MKDIR_P = @MKDIR_P@

24707

24628

SYSCONFDIR = @SYSCONFDIR@

24708

24629

USE_NLS = @USE_NLS@

24709

24630

VERSION = @VERSION@

24710

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/invest-applet/Makefile.in gnome-applets-2.21.2.new/invest-applet/Makefile.in

24711

--- gnome-applets-2.21.2/invest-applet/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24712

+++ gnome-applets-2.21.2.new/invest-applet/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24713

@@ -37,7 +37,6 @@

24714

$(top_srcdir)/m4/acinclude.m4 \

24715

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24716

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24717

- $(top_srcdir)/m4/system-tools-backends.m4 \

24718

$(top_srcdir)/configure.in

24719

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24720

$(ACLOCAL_M4)

24721

@@ -193,6 +192,7 @@

24722

MIXER_LIBS = @MIXER_LIBS@

24723

MKDIR_P = @MKDIR_P@

24724

MKINSTALLDIRS = @MKINSTALLDIRS@

24725

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24726

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24727

MSGFMT = @MSGFMT@

24728

MSGFMT_OPTS = @MSGFMT_OPTS@

24729

@@ -224,11 +224,10 @@

24730

RANLIB = @RANLIB@

24731

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24732

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24733

+SED = @SED@

24734

SET_MAKE = @SET_MAKE@

24735

SHELL = @SHELL@

24736

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24737

STRIP = @STRIP@

24738

-SU_TOOL = @SU_TOOL@

24739

SYSCONFDIR = @SYSCONFDIR@

24740

USE_NLS = @USE_NLS@

24741

VERSION = @VERSION@

24742

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/libgweather/Makefile.in gnome-applets-2.21.2.new/libgweather/Makefile.in

24743

--- gnome-applets-2.21.2/libgweather/Makefile.in 2007-12-03 10:32:24.000000000 +0100

24744

+++ gnome-applets-2.21.2.new/libgweather/Makefile.in 2007-12-03 10:33:59.000000000 +0100

24745

@@ -45,7 +45,6 @@

24746

$(top_srcdir)/m4/acinclude.m4 \

24747

$(top_srcdir)/m4/gnome-doc-utils.m4 \

24748

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

24749

- $(top_srcdir)/m4/system-tools-backends.m4 \

24750

$(top_srcdir)/configure.in

24751

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

24752

$(ACLOCAL_M4)

24753

@@ -238,6 +237,7 @@

24754

MIXER_LIBS = @MIXER_LIBS@

24755

MKDIR_P = @MKDIR_P@

24756

MKINSTALLDIRS = @MKINSTALLDIRS@

24757

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

24758

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

24759

MSGFMT = @MSGFMT@

24760

MSGFMT_OPTS = @MSGFMT_OPTS@

24761

@@ -269,11 +269,10 @@

24762

RANLIB = @RANLIB@

24763

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

24764

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

24765

+SED = @SED@

24766

SET_MAKE = @SET_MAKE@

24767

SHELL = @SHELL@

24768

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

24769

STRIP = @STRIP@

24770

-SU_TOOL = @SU_TOOL@

24771

SYSCONFDIR = @SYSCONFDIR@

24772

USE_NLS = @USE_NLS@

24773

VERSION = @VERSION@

24774

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/ltmain.sh gnome-applets-2.21.2.new/ltmain.sh

24775

--- gnome-applets-2.21.2/ltmain.sh 2007-06-02 07:47:43.000000000 +0200

24776

+++ gnome-applets-2.21.2.new/ltmain.sh 2007-08-14 19:43:36.000000000 +0200

24631

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/ltmain.sh gnome-applets-2.21.4.new/ltmain.sh

24632

--- gnome-applets-2.21.4/ltmain.sh 2007-06-02 07:47:43.000000000 +0200

24633

+++ gnome-applets-2.21.4.new/ltmain.sh 2008-01-15 15:34:28.000000000 +0100

24777

24634

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

24778

24635

# ltmain.sh - Provide generalized library-building support services.

24779

24636

# NOTE: Changing this file will not affect anything until you rerun configure.

25327

25184

25328

25185

All other options (arguments beginning with \`-') are ignored.

25329

25186

25330

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/Makefile.in gnome-applets-2.21.2.new/Makefile.in

25331

--- gnome-applets-2.21.2/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25332

+++ gnome-applets-2.21.2.new/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25187

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/Makefile.in gnome-applets-2.21.4.new/Makefile.in

25188

--- gnome-applets-2.21.4/Makefile.in 2008-01-14 20:49:43.000000000 +0100

25189

+++ gnome-applets-2.21.4.new/Makefile.in 2008-01-15 15:34:45.000000000 +0100

25333

25190

@@ -41,7 +41,6 @@

25334

25191

$(top_srcdir)/m4/acinclude.m4 \

25335

25192

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25338

25195

$(top_srcdir)/configure.in

25339

25196

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25340

25197

$(ACLOCAL_M4)

25341

@@ -207,6 +206,7 @@

25198

@@ -210,6 +209,7 @@

25342

25199

MIXER_LIBS = @MIXER_LIBS@

25343

25200

MKDIR_P = @MKDIR_P@

25344

25201

MKINSTALLDIRS = @MKINSTALLDIRS@

25346

25203

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25347

25204

MSGFMT = @MSGFMT@

25348

25205

MSGFMT_OPTS = @MSGFMT_OPTS@

25349

@@ -238,11 +238,10 @@

25206

@@ -241,11 +241,10 @@

25350

25207

RANLIB = @RANLIB@

25351

25208

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25352

25209

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25359

25216

SYSCONFDIR = @SYSCONFDIR@

25360

25217

USE_NLS = @USE_NLS@

25361

25218

VERSION = @VERSION@

25362

@@ -347,6 +346,7 @@

25363

25364

SUBDIRS = \

25365

po \

25366

+ po-locations \

25367

$(always_built_SUBDIRS) \

25368

$(mixer_SUBDIRS) \

25369

$(modemlights_SUBDIRS) \

25370

@@ -360,6 +360,7 @@

25371

25372

DIST_SUBDIRS = \

25373

po \

25374

+ po-locations \

25375

mixer \

25376

modemlights \

25377

drivemount \

25378

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/man/Makefile.in gnome-applets-2.21.2.new/man/Makefile.in

25379

--- gnome-applets-2.21.2/man/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25380

+++ gnome-applets-2.21.2.new/man/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25219

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/man/Makefile.in gnome-applets-2.21.4.new/man/Makefile.in

25220

--- gnome-applets-2.21.4/man/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25221

+++ gnome-applets-2.21.4.new/man/Makefile.in 2008-01-15 15:34:43.000000000 +0100

25381

25222

@@ -37,7 +37,6 @@

25382

25223

$(top_srcdir)/m4/acinclude.m4 \

25383

25224

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25386

25227

$(top_srcdir)/configure.in

25387

25228

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25388

25229

$(ACLOCAL_M4)

25389

@@ -185,6 +184,7 @@

25230

@@ -188,6 +187,7 @@

25390

25231

MIXER_LIBS = @MIXER_LIBS@

25391

25232

MKDIR_P = @MKDIR_P@

25392

25233

MKINSTALLDIRS = @MKINSTALLDIRS@

25394

25235

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25395

25236

MSGFMT = @MSGFMT@

25396

25237

MSGFMT_OPTS = @MSGFMT_OPTS@

25397

@@ -216,11 +216,10 @@

25238

@@ -219,11 +219,10 @@

25398

25239

RANLIB = @RANLIB@

25399

25240

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25400

25241

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25407

25248

SYSCONFDIR = @SYSCONFDIR@

25408

25249

USE_NLS = @USE_NLS@

25409

25250

VERSION = @VERSION@

25410

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/mini-commander/help/Makefile.in gnome-applets-2.21.2.new/mini-commander/help/Makefile.in

25411

--- gnome-applets-2.21.2/mini-commander/help/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25412

+++ gnome-applets-2.21.2.new/mini-commander/help/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25251

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/mini-commander/help/Makefile.in gnome-applets-2.21.4.new/mini-commander/help/Makefile.in

25252

--- gnome-applets-2.21.4/mini-commander/help/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25253

+++ gnome-applets-2.21.4.new/mini-commander/help/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25413

25254

@@ -62,7 +62,6 @@

25414

25255

$(top_srcdir)/m4/acinclude.m4 \

25415

25256

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25418

25259

$(top_srcdir)/configure.in

25419

25260

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25420

25261

$(ACLOCAL_M4)

25421

@@ -206,6 +205,7 @@

25262

@@ -209,6 +208,7 @@

25422

25263

MIXER_LIBS = @MIXER_LIBS@

25423

25264

MKDIR_P = @MKDIR_P@

25424

25265

MKINSTALLDIRS = @MKINSTALLDIRS@

25426

25267

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25427

25268

MSGFMT = @MSGFMT@

25428

25269

MSGFMT_OPTS = @MSGFMT_OPTS@

25429

@@ -237,11 +237,10 @@

25270

@@ -240,11 +240,10 @@

25430

25271

RANLIB = @RANLIB@

25431

25272

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25432

25273

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25439

25280

SYSCONFDIR = @SYSCONFDIR@

25440

25281

USE_NLS = @USE_NLS@

25441

25282

VERSION = @VERSION@

25442

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/mini-commander/Makefile.in gnome-applets-2.21.2.new/mini-commander/Makefile.in

25443

--- gnome-applets-2.21.2/mini-commander/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25444

+++ gnome-applets-2.21.2.new/mini-commander/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25283

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/mini-commander/Makefile.in gnome-applets-2.21.4.new/mini-commander/Makefile.in

25284

--- gnome-applets-2.21.4/mini-commander/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25285

+++ gnome-applets-2.21.4.new/mini-commander/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25445

25286

@@ -39,7 +39,6 @@

25446

25287

$(top_srcdir)/m4/acinclude.m4 \

25447

25288

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25450

25291

$(top_srcdir)/configure.in

25451

25292

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25452

25293

$(ACLOCAL_M4)

25453

@@ -203,6 +202,7 @@

25294

@@ -206,6 +205,7 @@

25454

25295

MIXER_LIBS = @MIXER_LIBS@

25455

25296

MKDIR_P = @MKDIR_P@

25456

25297

MKINSTALLDIRS = @MKINSTALLDIRS@

25458

25299

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25459

25300

MSGFMT = @MSGFMT@

25460

25301

MSGFMT_OPTS = @MSGFMT_OPTS@

25461

@@ -234,11 +234,10 @@

25302

@@ -237,11 +237,10 @@

25462

25303

RANLIB = @RANLIB@

25463

25304

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25464

25305

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25471

25312

SYSCONFDIR = @SYSCONFDIR@

25472

25313

USE_NLS = @USE_NLS@

25473

25314

VERSION = @VERSION@

25474

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/mini-commander/src/Makefile.in gnome-applets-2.21.2.new/mini-commander/src/Makefile.in

25475

--- gnome-applets-2.21.2/mini-commander/src/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25476

+++ gnome-applets-2.21.2.new/mini-commander/src/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25315

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/mini-commander/src/Makefile.in gnome-applets-2.21.4.new/mini-commander/src/Makefile.in

25316

--- gnome-applets-2.21.4/mini-commander/src/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25317

+++ gnome-applets-2.21.4.new/mini-commander/src/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25477

25318

@@ -41,7 +41,6 @@

25478

25319

$(top_srcdir)/m4/acinclude.m4 \

25479

25320

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25482

25323

$(top_srcdir)/configure.in

25483

25324

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25484

25325

$(ACLOCAL_M4)

25326

@@ -237,6 +236,7 @@

25327

MIXER_LIBS = @MIXER_LIBS@

25328

MKDIR_P = @MKDIR_P@

25329

MKINSTALLDIRS = @MKINSTALLDIRS@

25330

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25331

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25332

MSGFMT = @MSGFMT@

25333

MSGFMT_OPTS = @MSGFMT_OPTS@

25334

@@ -268,11 +268,10 @@

25335

RANLIB = @RANLIB@

25336

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25337

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25338

+SED = @SED@

25339

SET_MAKE = @SET_MAKE@

25340

SHELL = @SHELL@

25341

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25342

STRIP = @STRIP@

25343

-SU_TOOL = @SU_TOOL@

25344

SYSCONFDIR = @SYSCONFDIR@

25345

USE_NLS = @USE_NLS@

25346

VERSION = @VERSION@

25347

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/mixer/docs/Makefile.in gnome-applets-2.21.4.new/mixer/docs/Makefile.in

25348

--- gnome-applets-2.21.4/mixer/docs/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25349

+++ gnome-applets-2.21.4.new/mixer/docs/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25350

@@ -62,7 +62,6 @@

25351

$(top_srcdir)/m4/acinclude.m4 \

25352

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25353

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25354

- $(top_srcdir)/m4/system-tools-backends.m4 \

25355

$(top_srcdir)/configure.in

25356

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25357

$(ACLOCAL_M4)

25358

@@ -209,6 +208,7 @@

25359

MIXER_LIBS = @MIXER_LIBS@

25360

MKDIR_P = @MKDIR_P@

25361

MKINSTALLDIRS = @MKINSTALLDIRS@

25362

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25363

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25364

MSGFMT = @MSGFMT@

25365

MSGFMT_OPTS = @MSGFMT_OPTS@

25366

@@ -240,11 +240,10 @@

25367

RANLIB = @RANLIB@

25368

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25369

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25370

+SED = @SED@

25371

SET_MAKE = @SET_MAKE@

25372

SHELL = @SHELL@

25373

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25374

STRIP = @STRIP@

25375

-SU_TOOL = @SU_TOOL@

25376

SYSCONFDIR = @SYSCONFDIR@

25377

USE_NLS = @USE_NLS@

25378

VERSION = @VERSION@

25379

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/mixer/Makefile.in gnome-applets-2.21.4.new/mixer/Makefile.in

25380

--- gnome-applets-2.21.4/mixer/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25381

+++ gnome-applets-2.21.4.new/mixer/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25382

@@ -42,7 +42,6 @@

25383

$(top_srcdir)/m4/acinclude.m4 \

25384

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25385

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25386

- $(top_srcdir)/m4/system-tools-backends.m4 \

25387

$(top_srcdir)/configure.in

25388

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25389

$(ACLOCAL_M4)

25485

25390

@@ -234,6 +233,7 @@

25486

25391

MIXER_LIBS = @MIXER_LIBS@

25487

25392

MKDIR_P = @MKDIR_P@

25503

25408

SYSCONFDIR = @SYSCONFDIR@

25504

25409

USE_NLS = @USE_NLS@

25505

25410

VERSION = @VERSION@

25506

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/mixer/docs/Makefile.in gnome-applets-2.21.2.new/mixer/docs/Makefile.in

25507

--- gnome-applets-2.21.2/mixer/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25508

+++ gnome-applets-2.21.2.new/mixer/docs/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25509

@@ -62,7 +62,6 @@

25510

$(top_srcdir)/m4/acinclude.m4 \

25511

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25512

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25513

- $(top_srcdir)/m4/system-tools-backends.m4 \

25514

$(top_srcdir)/configure.in

25515

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25516

$(ACLOCAL_M4)

25517

@@ -206,6 +205,7 @@

25518

MIXER_LIBS = @MIXER_LIBS@

25519

MKDIR_P = @MKDIR_P@

25520

MKINSTALLDIRS = @MKINSTALLDIRS@

25521

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25522

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25523

MSGFMT = @MSGFMT@

25524

MSGFMT_OPTS = @MSGFMT_OPTS@

25525

@@ -237,11 +237,10 @@

25526

RANLIB = @RANLIB@

25527

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25528

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25529

+SED = @SED@

25530

SET_MAKE = @SET_MAKE@

25531

SHELL = @SHELL@

25532

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25533

STRIP = @STRIP@

25534

-SU_TOOL = @SU_TOOL@

25535

SYSCONFDIR = @SYSCONFDIR@

25536

USE_NLS = @USE_NLS@

25537

VERSION = @VERSION@

25538

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/mixer/Makefile.in gnome-applets-2.21.2.new/mixer/Makefile.in

25539

--- gnome-applets-2.21.2/mixer/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25540

+++ gnome-applets-2.21.2.new/mixer/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25541

@@ -42,7 +42,6 @@

25542

$(top_srcdir)/m4/acinclude.m4 \

25543

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25544

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25545

- $(top_srcdir)/m4/system-tools-backends.m4 \

25546

$(top_srcdir)/configure.in

25547

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25548

$(ACLOCAL_M4)

25549

@@ -231,6 +230,7 @@

25550

MIXER_LIBS = @MIXER_LIBS@

25551

MKDIR_P = @MKDIR_P@

25552

MKINSTALLDIRS = @MKINSTALLDIRS@

25553

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25554

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25555

MSGFMT = @MSGFMT@

25556

MSGFMT_OPTS = @MSGFMT_OPTS@

25557

@@ -262,11 +262,10 @@

25558

RANLIB = @RANLIB@

25559

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25560

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25561

+SED = @SED@

25562

SET_MAKE = @SET_MAKE@

25563

SHELL = @SHELL@

25564

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25565

STRIP = @STRIP@

25566

-SU_TOOL = @SU_TOOL@

25567

SYSCONFDIR = @SYSCONFDIR@

25568

USE_NLS = @USE_NLS@

25569

VERSION = @VERSION@

25570

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/modemlights/Makefile.in gnome-applets-2.21.2.new/modemlights/Makefile.in

25571

--- gnome-applets-2.21.2/modemlights/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25572

+++ gnome-applets-2.21.2.new/modemlights/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25411

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/modemlights/Makefile.in gnome-applets-2.21.4.new/modemlights/Makefile.in

25412

--- gnome-applets-2.21.4/modemlights/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25413

+++ gnome-applets-2.21.4.new/modemlights/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25573

25414

@@ -43,7 +43,6 @@

25574

25415

$(top_srcdir)/m4/acinclude.m4 \

25575

25416

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25578

25419

$(top_srcdir)/configure.in

25579

25420

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25580

25421

$(ACLOCAL_M4)

25581

@@ -220,6 +219,7 @@

25422

@@ -223,6 +222,7 @@

25582

25423

MIXER_LIBS = @MIXER_LIBS@

25583

25424

MKDIR_P = @MKDIR_P@

25584

25425

MKINSTALLDIRS = @MKINSTALLDIRS@

25586

25427

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25587

25428

MSGFMT = @MSGFMT@

25588

25429

MSGFMT_OPTS = @MSGFMT_OPTS@

25589

@@ -251,11 +251,10 @@

25430

@@ -254,11 +254,10 @@

25590

25431

RANLIB = @RANLIB@

25591

25432

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25592

25433

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25599

25440

SYSCONFDIR = @SYSCONFDIR@

25600

25441

USE_NLS = @USE_NLS@

25601

25442

VERSION = @VERSION@

25602

@@ -328,8 +327,9 @@

25443

@@ -331,8 +330,9 @@

25603

25444

target_alias = @target_alias@

25604

25445

top_builddir = @top_builddir@

25605

25446

top_srcdir = @top_srcdir@

25611

25452

$(LIBGLADE_CFLAGS)

25612

25453

25613

25454

modem_applet_SOURCES = \

25614

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/multiload/docs/Makefile.in gnome-applets-2.21.2.new/multiload/docs/Makefile.in

25615

--- gnome-applets-2.21.2/multiload/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25616

+++ gnome-applets-2.21.2.new/multiload/docs/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25455

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/multiload/docs/Makefile.in gnome-applets-2.21.4.new/multiload/docs/Makefile.in

25456

--- gnome-applets-2.21.4/multiload/docs/Makefile.in 2008-01-14 20:49:42.000000000 +0100

25457

+++ gnome-applets-2.21.4.new/multiload/docs/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25617

25458

@@ -62,7 +62,6 @@

25618

25459

$(top_srcdir)/m4/acinclude.m4 \

25619

25460

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25622

25463

$(top_srcdir)/configure.in

25623

25464

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25624

25465

$(ACLOCAL_M4)

25625

@@ -206,6 +205,7 @@

25626

MIXER_LIBS = @MIXER_LIBS@

25627

MKDIR_P = @MKDIR_P@

25628

MKINSTALLDIRS = @MKINSTALLDIRS@

25629

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25630

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25631

MSGFMT = @MSGFMT@

25632

MSGFMT_OPTS = @MSGFMT_OPTS@

25633

@@ -237,11 +237,10 @@

25634

RANLIB = @RANLIB@

25635

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25636

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25637

+SED = @SED@

25638

SET_MAKE = @SET_MAKE@

25639

SHELL = @SHELL@

25640

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25641

STRIP = @STRIP@

25642

-SU_TOOL = @SU_TOOL@

25643

SYSCONFDIR = @SYSCONFDIR@

25644

USE_NLS = @USE_NLS@

25645

VERSION = @VERSION@

25646

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/multiload/Makefile.in gnome-applets-2.21.2.new/multiload/Makefile.in

25647

--- gnome-applets-2.21.2/multiload/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25648

+++ gnome-applets-2.21.2.new/multiload/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25649

@@ -41,7 +41,6 @@

25650

$(top_srcdir)/m4/acinclude.m4 \

25651

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25652

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25653

- $(top_srcdir)/m4/system-tools-backends.m4 \

25654

$(top_srcdir)/configure.in

25655

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25656

$(ACLOCAL_M4)

25657

@@ -231,6 +230,7 @@

25658

MIXER_LIBS = @MIXER_LIBS@

25659

MKDIR_P = @MKDIR_P@

25660

MKINSTALLDIRS = @MKINSTALLDIRS@

25661

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25662

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25663

MSGFMT = @MSGFMT@

25664

MSGFMT_OPTS = @MSGFMT_OPTS@

25665

@@ -262,11 +262,10 @@

25666

RANLIB = @RANLIB@

25667

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25668

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25669

+SED = @SED@

25670

SET_MAKE = @SET_MAKE@

25671

SHELL = @SHELL@

25672

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25673

STRIP = @STRIP@

25674

-SU_TOOL = @SU_TOOL@

25675

SYSCONFDIR = @SYSCONFDIR@

25676

USE_NLS = @USE_NLS@

25677

VERSION = @VERSION@

25678

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/null_applet/Makefile.in gnome-applets-2.21.2.new/null_applet/Makefile.in

25679

--- gnome-applets-2.21.2/null_applet/Makefile.in 2007-12-03 10:32:24.000000000 +0100

25680

+++ gnome-applets-2.21.2.new/null_applet/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25681

@@ -41,7 +41,6 @@

25682

$(top_srcdir)/m4/acinclude.m4 \

25683

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25684

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25685

- $(top_srcdir)/m4/system-tools-backends.m4 \

25686

$(top_srcdir)/configure.in

25687

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25688

$(ACLOCAL_M4)

25689

@@ -214,6 +213,7 @@

25690

MIXER_LIBS = @MIXER_LIBS@

25691

MKDIR_P = @MKDIR_P@

25692

MKINSTALLDIRS = @MKINSTALLDIRS@

25693

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25694

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25695

MSGFMT = @MSGFMT@

25696

MSGFMT_OPTS = @MSGFMT_OPTS@

25697

@@ -245,11 +245,10 @@

25698

RANLIB = @RANLIB@

25699

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25700

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25701

+SED = @SED@

25702

SET_MAKE = @SET_MAKE@

25703

SHELL = @SHELL@

25704

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25705

STRIP = @STRIP@

25706

-SU_TOOL = @SU_TOOL@

25707

SYSCONFDIR = @SYSCONFDIR@

25708

USE_NLS = @USE_NLS@

25709

VERSION = @VERSION@

25710

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/po-locations/Makefile.in gnome-applets-2.21.2.new/po-locations/Makefile.in

25711

--- gnome-applets-2.21.2/po-locations/Makefile.in 1970-01-01 01:00:00.000000000 +0100

25712

+++ gnome-applets-2.21.2.new/po-locations/Makefile.in 2007-12-03 10:33:59.000000000 +0100

25466

@@ -209,6 +208,7 @@

25467

MIXER_LIBS = @MIXER_LIBS@

25468

MKDIR_P = @MKDIR_P@

25469

MKINSTALLDIRS = @MKINSTALLDIRS@

25470

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25471

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25472

MSGFMT = @MSGFMT@

25473

MSGFMT_OPTS = @MSGFMT_OPTS@

25474

@@ -240,11 +240,10 @@

25475

RANLIB = @RANLIB@

25476

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25477

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25478

+SED = @SED@

25479

SET_MAKE = @SET_MAKE@

25480

SHELL = @SHELL@

25481

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25482

STRIP = @STRIP@

25483

-SU_TOOL = @SU_TOOL@

25484

SYSCONFDIR = @SYSCONFDIR@

25485

USE_NLS = @USE_NLS@

25486

VERSION = @VERSION@

25487

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/multiload/Makefile.in gnome-applets-2.21.4.new/multiload/Makefile.in

25488

--- gnome-applets-2.21.4/multiload/Makefile.in 2008-01-14 20:49:41.000000000 +0100

25489

+++ gnome-applets-2.21.4.new/multiload/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25490

@@ -41,7 +41,6 @@

25491

$(top_srcdir)/m4/acinclude.m4 \

25492

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25493

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25494

- $(top_srcdir)/m4/system-tools-backends.m4 \

25495

$(top_srcdir)/configure.in

25496

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25497

$(ACLOCAL_M4)

25498

@@ -234,6 +233,7 @@

25499

MIXER_LIBS = @MIXER_LIBS@

25500

MKDIR_P = @MKDIR_P@

25501

MKINSTALLDIRS = @MKINSTALLDIRS@

25502

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25503

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25504

MSGFMT = @MSGFMT@

25505

MSGFMT_OPTS = @MSGFMT_OPTS@

25506

@@ -265,11 +265,10 @@

25507

RANLIB = @RANLIB@

25508

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25509

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25510

+SED = @SED@

25511

SET_MAKE = @SET_MAKE@

25512

SHELL = @SHELL@

25513

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25514

STRIP = @STRIP@

25515

-SU_TOOL = @SU_TOOL@

25516

SYSCONFDIR = @SYSCONFDIR@

25517

USE_NLS = @USE_NLS@

25518

VERSION = @VERSION@

25519

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/null_applet/Makefile.in gnome-applets-2.21.4.new/null_applet/Makefile.in

25520

--- gnome-applets-2.21.4/null_applet/Makefile.in 2008-01-14 20:49:42.000000000 +0100

25521

+++ gnome-applets-2.21.4.new/null_applet/Makefile.in 2008-01-15 15:34:44.000000000 +0100

25522

@@ -41,7 +41,6 @@

25523

$(top_srcdir)/m4/acinclude.m4 \

25524

$(top_srcdir)/m4/gnome-doc-utils.m4 \

25525

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

25526

- $(top_srcdir)/m4/system-tools-backends.m4 \

25527

$(top_srcdir)/configure.in

25528

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

25529

$(ACLOCAL_M4)

25530

@@ -217,6 +216,7 @@

25531

MIXER_LIBS = @MIXER_LIBS@

25532

MKDIR_P = @MKDIR_P@

25533

MKINSTALLDIRS = @MKINSTALLDIRS@

25534

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

25535

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

25536

MSGFMT = @MSGFMT@

25537

MSGFMT_OPTS = @MSGFMT_OPTS@

25538

@@ -248,11 +248,10 @@

25539

RANLIB = @RANLIB@

25540

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

25541

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

25542

+SED = @SED@

25543

SET_MAKE = @SET_MAKE@

25544

SHELL = @SHELL@

25545

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

25546

STRIP = @STRIP@

25547

-SU_TOOL = @SU_TOOL@

25548

SYSCONFDIR = @SYSCONFDIR@

25549

USE_NLS = @USE_NLS@

25550

VERSION = @VERSION@

25551

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/po-locations/Makefile.in gnome-applets-2.21.4.new/po-locations/Makefile.in

25552

--- gnome-applets-2.21.4/po-locations/Makefile.in 1970-01-01 01:00:00.000000000 +0100

25553

+++ gnome-applets-2.21.4.new/po-locations/Makefile.in 2008-01-15 15:34:28.000000000 +0100

25713

25554

@@ -0,0 +1,464 @@

25714

25555

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

25715

25556

+# @configure_input@

26175

26016

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

26176

26017

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

26177

26018

+.NOEXPORT:

26178

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/stickynotes/data/Makefile.in gnome-applets-2.21.2.new/stickynotes/data/Makefile.in

26179

--- gnome-applets-2.21.2/stickynotes/data/Makefile.in 2007-12-03 10:32:24.000000000 +0100

26180

+++ gnome-applets-2.21.2.new/stickynotes/data/Makefile.in 2007-12-03 10:33:59.000000000 +0100

26019

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/stickynotes/data/Makefile.in gnome-applets-2.21.4.new/stickynotes/data/Makefile.in

26020

--- gnome-applets-2.21.4/stickynotes/data/Makefile.in 2008-01-14 20:49:42.000000000 +0100

26021

+++ gnome-applets-2.21.4.new/stickynotes/data/Makefile.in 2008-01-15 15:34:44.000000000 +0100

26181

26022

@@ -41,7 +41,6 @@

26182

26023

$(top_srcdir)/m4/acinclude.m4 \

26183

26024

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26186

26027

$(top_srcdir)/configure.in

26187

26028

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26188

26029

$(ACLOCAL_M4)

26030

@@ -197,6 +196,7 @@

26031

MIXER_LIBS = @MIXER_LIBS@

26032

MKDIR_P = @MKDIR_P@

26033

MKINSTALLDIRS = @MKINSTALLDIRS@

26034

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26035

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26036

MSGFMT = @MSGFMT@

26037

MSGFMT_OPTS = @MSGFMT_OPTS@

26038

@@ -228,11 +228,10 @@

26039

RANLIB = @RANLIB@

26040

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26041

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26042

+SED = @SED@

26043

SET_MAKE = @SET_MAKE@

26044

SHELL = @SHELL@

26045

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26046

STRIP = @STRIP@

26047

-SU_TOOL = @SU_TOOL@

26048

SYSCONFDIR = @SYSCONFDIR@

26049

USE_NLS = @USE_NLS@

26050

VERSION = @VERSION@

26051

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/stickynotes/docs/Makefile.in gnome-applets-2.21.4.new/stickynotes/docs/Makefile.in

26052

--- gnome-applets-2.21.4/stickynotes/docs/Makefile.in 2008-01-14 20:49:42.000000000 +0100

26053

+++ gnome-applets-2.21.4.new/stickynotes/docs/Makefile.in 2008-01-15 15:34:44.000000000 +0100

26054

@@ -62,7 +62,6 @@

26055

$(top_srcdir)/m4/acinclude.m4 \

26056

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26057

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26058

- $(top_srcdir)/m4/system-tools-backends.m4 \

26059

$(top_srcdir)/configure.in

26060

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26061

$(ACLOCAL_M4)

26062

@@ -209,6 +208,7 @@

26063

MIXER_LIBS = @MIXER_LIBS@

26064

MKDIR_P = @MKDIR_P@

26065

MKINSTALLDIRS = @MKINSTALLDIRS@

26066

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26067

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26068

MSGFMT = @MSGFMT@

26069

MSGFMT_OPTS = @MSGFMT_OPTS@

26070

@@ -240,11 +240,10 @@

26071

RANLIB = @RANLIB@

26072

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26073

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26074

+SED = @SED@

26075

SET_MAKE = @SET_MAKE@

26076

SHELL = @SHELL@

26077

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26078

STRIP = @STRIP@

26079

-SU_TOOL = @SU_TOOL@

26080

SYSCONFDIR = @SYSCONFDIR@

26081

USE_NLS = @USE_NLS@

26082

VERSION = @VERSION@

26083

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/stickynotes/Makefile.in gnome-applets-2.21.4.new/stickynotes/Makefile.in

26084

--- gnome-applets-2.21.4/stickynotes/Makefile.in 2008-01-14 20:49:42.000000000 +0100

26085

+++ gnome-applets-2.21.4.new/stickynotes/Makefile.in 2008-01-15 15:34:44.000000000 +0100

26086

@@ -42,7 +42,6 @@

26087

$(top_srcdir)/m4/acinclude.m4 \

26088

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26089

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26090

- $(top_srcdir)/m4/system-tools-backends.m4 \

26091

$(top_srcdir)/configure.in

26092

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26093

$(ACLOCAL_M4)

26094

@@ -246,6 +245,7 @@

26095

MIXER_LIBS = @MIXER_LIBS@

26096

MKDIR_P = @MKDIR_P@

26097

MKINSTALLDIRS = @MKINSTALLDIRS@

26098

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26099

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26100

MSGFMT = @MSGFMT@

26101

MSGFMT_OPTS = @MSGFMT_OPTS@

26102

@@ -277,11 +277,10 @@

26103

RANLIB = @RANLIB@

26104

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26105

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26106

+SED = @SED@

26107

SET_MAKE = @SET_MAKE@

26108

SHELL = @SHELL@

26109

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26110

STRIP = @STRIP@

26111

-SU_TOOL = @SU_TOOL@

26112

SYSCONFDIR = @SYSCONFDIR@

26113

USE_NLS = @USE_NLS@

26114

VERSION = @VERSION@

26115

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/stickynotes/pixmaps/Makefile.in gnome-applets-2.21.4.new/stickynotes/pixmaps/Makefile.in

26116

--- gnome-applets-2.21.4/stickynotes/pixmaps/Makefile.in 2008-01-14 20:49:42.000000000 +0100

26117

+++ gnome-applets-2.21.4.new/stickynotes/pixmaps/Makefile.in 2008-01-15 15:34:44.000000000 +0100

26118

@@ -38,7 +38,6 @@

26119

$(top_srcdir)/m4/acinclude.m4 \

26120

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26121

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26122

- $(top_srcdir)/m4/system-tools-backends.m4 \

26123

$(top_srcdir)/configure.in

26124

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26125

$(ACLOCAL_M4)

26189

26126

@@ -194,6 +193,7 @@

26190

26127

MIXER_LIBS = @MIXER_LIBS@

26191

26128

MKDIR_P = @MKDIR_P@

26207

26144

SYSCONFDIR = @SYSCONFDIR@

26208

26145

USE_NLS = @USE_NLS@

26209

26146

VERSION = @VERSION@

26210

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/stickynotes/docs/Makefile.in gnome-applets-2.21.2.new/stickynotes/docs/Makefile.in

26211

--- gnome-applets-2.21.2/stickynotes/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

26212

+++ gnome-applets-2.21.2.new/stickynotes/docs/Makefile.in 2007-12-03 10:33:59.000000000 +0100

26213

@@ -62,7 +62,6 @@

26214

$(top_srcdir)/m4/acinclude.m4 \

26215

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26216

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26217

- $(top_srcdir)/m4/system-tools-backends.m4 \

26218

$(top_srcdir)/configure.in

26219

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26220

$(ACLOCAL_M4)

26221

@@ -206,6 +205,7 @@

26222

MIXER_LIBS = @MIXER_LIBS@

26223

MKDIR_P = @MKDIR_P@

26224

MKINSTALLDIRS = @MKINSTALLDIRS@

26225

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26226

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26227

MSGFMT = @MSGFMT@

26228

MSGFMT_OPTS = @MSGFMT_OPTS@

26229

@@ -237,11 +237,10 @@

26230

RANLIB = @RANLIB@

26231

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26232

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26233

+SED = @SED@

26234

SET_MAKE = @SET_MAKE@

26235

SHELL = @SHELL@

26236

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26237

STRIP = @STRIP@

26238

-SU_TOOL = @SU_TOOL@

26239

SYSCONFDIR = @SYSCONFDIR@

26240

USE_NLS = @USE_NLS@

26241

VERSION = @VERSION@

26242

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/stickynotes/Makefile.in gnome-applets-2.21.2.new/stickynotes/Makefile.in

26243

--- gnome-applets-2.21.2/stickynotes/Makefile.in 2007-12-03 10:32:24.000000000 +0100

26244

+++ gnome-applets-2.21.2.new/stickynotes/Makefile.in 2007-12-03 10:33:59.000000000 +0100

26245

@@ -42,7 +42,6 @@

26246

$(top_srcdir)/m4/acinclude.m4 \

26247

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26248

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26249

- $(top_srcdir)/m4/system-tools-backends.m4 \

26250

$(top_srcdir)/configure.in

26251

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26252

$(ACLOCAL_M4)

26253

@@ -243,6 +242,7 @@

26254

MIXER_LIBS = @MIXER_LIBS@

26255

MKDIR_P = @MKDIR_P@

26256

MKINSTALLDIRS = @MKINSTALLDIRS@

26257

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26258

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26259

MSGFMT = @MSGFMT@

26260

MSGFMT_OPTS = @MSGFMT_OPTS@

26261

@@ -274,11 +274,10 @@

26262

RANLIB = @RANLIB@

26263

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26264

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26265

+SED = @SED@

26266

SET_MAKE = @SET_MAKE@

26267

SHELL = @SHELL@

26268

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26269

STRIP = @STRIP@

26270

-SU_TOOL = @SU_TOOL@

26271

SYSCONFDIR = @SYSCONFDIR@

26272

USE_NLS = @USE_NLS@

26273

VERSION = @VERSION@

26274

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/stickynotes/pixmaps/Makefile.in gnome-applets-2.21.2.new/stickynotes/pixmaps/Makefile.in

26275

--- gnome-applets-2.21.2/stickynotes/pixmaps/Makefile.in 2007-12-03 10:32:24.000000000 +0100

26276

+++ gnome-applets-2.21.2.new/stickynotes/pixmaps/Makefile.in 2007-12-03 10:33:59.000000000 +0100

26277

@@ -38,7 +38,6 @@

26278

$(top_srcdir)/m4/acinclude.m4 \

26279

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26280

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26281

- $(top_srcdir)/m4/system-tools-backends.m4 \

26282

$(top_srcdir)/configure.in

26283

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26284

$(ACLOCAL_M4)

26285

@@ -191,6 +190,7 @@

26286

MIXER_LIBS = @MIXER_LIBS@

26287

MKDIR_P = @MKDIR_P@

26288

MKINSTALLDIRS = @MKINSTALLDIRS@

26289

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26290

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26291

MSGFMT = @MSGFMT@

26292

MSGFMT_OPTS = @MSGFMT_OPTS@

26293

@@ -222,11 +222,10 @@

26294

RANLIB = @RANLIB@

26295

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26296

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26297

+SED = @SED@

26298

SET_MAKE = @SET_MAKE@

26299

SHELL = @SHELL@

26300

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26301

STRIP = @STRIP@

26302

-SU_TOOL = @SU_TOOL@

26303

SYSCONFDIR = @SYSCONFDIR@

26304

USE_NLS = @USE_NLS@

26305

VERSION = @VERSION@

26306

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/trashapplet/docs/Makefile.in gnome-applets-2.21.2.new/trashapplet/docs/Makefile.in

26307

--- gnome-applets-2.21.2/trashapplet/docs/Makefile.in 2007-12-03 10:32:24.000000000 +0100

26308

+++ gnome-applets-2.21.2.new/trashapplet/docs/Makefile.in 2007-12-03 10:33:59.000000000 +0100

26309

@@ -62,7 +62,6 @@

26310

$(top_srcdir)/m4/acinclude.m4 \

26311

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26312

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26313

- $(top_srcdir)/m4/system-tools-backends.m4 \

26314

$(top_srcdir)/configure.in

26315

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26316

$(ACLOCAL_M4)

26317

@@ -206,6 +205,7 @@

26318

MIXER_LIBS = @MIXER_LIBS@

26319

MKDIR_P = @MKDIR_P@

26320

MKINSTALLDIRS = @MKINSTALLDIRS@

26321

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26322

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26323

MSGFMT = @MSGFMT@

26324

MSGFMT_OPTS = @MSGFMT_OPTS@

26325

@@ -237,11 +237,10 @@

26326

RANLIB = @RANLIB@

26327

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26328

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26329

+SED = @SED@

26330

SET_MAKE = @SET_MAKE@

26331

SHELL = @SHELL@

26332

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26333

STRIP = @STRIP@

26334

-SU_TOOL = @SU_TOOL@

26335

SYSCONFDIR = @SYSCONFDIR@

26336

USE_NLS = @USE_NLS@

26337

VERSION = @VERSION@

26338

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/trashapplet/Makefile.in gnome-applets-2.21.2.new/trashapplet/Makefile.in

26339

--- gnome-applets-2.21.2/trashapplet/Makefile.in 2007-12-03 10:32:24.000000000 +0100

26340

+++ gnome-applets-2.21.2.new/trashapplet/Makefile.in 2007-12-03 10:33:59.000000000 +0100

26341

@@ -39,7 +39,6 @@

26342

$(top_srcdir)/m4/acinclude.m4 \

26343

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26344

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26345

- $(top_srcdir)/m4/system-tools-backends.m4 \

26346

$(top_srcdir)/configure.in

26347

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26348

$(ACLOCAL_M4)

26349

@@ -207,6 +206,7 @@

26350

MIXER_LIBS = @MIXER_LIBS@

26351

MKDIR_P = @MKDIR_P@

26352

MKINSTALLDIRS = @MKINSTALLDIRS@

26353

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26354

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26355

MSGFMT = @MSGFMT@

26356

MSGFMT_OPTS = @MSGFMT_OPTS@

26357

@@ -238,11 +238,10 @@

26358

RANLIB = @RANLIB@

26359

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26360

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26361

+SED = @SED@

26362

SET_MAKE = @SET_MAKE@

26363

SHELL = @SHELL@

26364

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26365

STRIP = @STRIP@

26366

-SU_TOOL = @SU_TOOL@

26367

SYSCONFDIR = @SYSCONFDIR@

26368

USE_NLS = @USE_NLS@

26369

VERSION = @VERSION@

26370

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.2/trashapplet/src/Makefile.in gnome-applets-2.21.2.new/trashapplet/src/Makefile.in

26371

--- gnome-applets-2.21.2/trashapplet/src/Makefile.in 2007-12-03 10:32:24.000000000 +0100

26372

+++ gnome-applets-2.21.2.new/trashapplet/src/Makefile.in 2007-12-03 10:33:59.000000000 +0100

26373

@@ -39,7 +39,6 @@

26374

$(top_srcdir)/m4/acinclude.m4 \

26375

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26376

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26377

- $(top_srcdir)/m4/system-tools-backends.m4 \

26378

$(top_srcdir)/configure.in

26379

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26380

$(ACLOCAL_M4)

26381

@@ -206,6 +205,7 @@

26382

MIXER_LIBS = @MIXER_LIBS@

26383

MKDIR_P = @MKDIR_P@

26384

MKINSTALLDIRS = @MKINSTALLDIRS@

26385

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26386

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26387

MSGFMT = @MSGFMT@

26388

MSGFMT_OPTS = @MSGFMT_OPTS@

26389

@@ -237,11 +237,10 @@

26147

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/trashapplet/docs/Makefile.in gnome-applets-2.21.4.new/trashapplet/docs/Makefile.in

26148

--- gnome-applets-2.21.4/trashapplet/docs/Makefile.in 2008-01-14 20:49:42.000000000 +0100

26149

+++ gnome-applets-2.21.4.new/trashapplet/docs/Makefile.in 2008-01-15 15:34:45.000000000 +0100

26150

@@ -62,7 +62,6 @@

26151

$(top_srcdir)/m4/acinclude.m4 \

26152

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26153

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26154

- $(top_srcdir)/m4/system-tools-backends.m4 \

26155

$(top_srcdir)/configure.in

26156

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26157

$(ACLOCAL_M4)

26158

@@ -209,6 +208,7 @@

26159

MIXER_LIBS = @MIXER_LIBS@

26160

MKDIR_P = @MKDIR_P@

26161

MKINSTALLDIRS = @MKINSTALLDIRS@

26162

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26163

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26164

MSGFMT = @MSGFMT@

26165

MSGFMT_OPTS = @MSGFMT_OPTS@

26166

@@ -240,11 +240,10 @@

26167

RANLIB = @RANLIB@

26168

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26169

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26170

+SED = @SED@

26171

SET_MAKE = @SET_MAKE@

26172

SHELL = @SHELL@

26173

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26174

STRIP = @STRIP@

26175

-SU_TOOL = @SU_TOOL@

26176

SYSCONFDIR = @SYSCONFDIR@

26177

USE_NLS = @USE_NLS@

26178

VERSION = @VERSION@

26179

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/trashapplet/Makefile.in gnome-applets-2.21.4.new/trashapplet/Makefile.in

26180

--- gnome-applets-2.21.4/trashapplet/Makefile.in 2008-01-14 20:49:42.000000000 +0100

26181

+++ gnome-applets-2.21.4.new/trashapplet/Makefile.in 2008-01-15 15:34:44.000000000 +0100

26182

@@ -39,7 +39,6 @@

26183

$(top_srcdir)/m4/acinclude.m4 \

26184

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26185

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26186

- $(top_srcdir)/m4/system-tools-backends.m4 \

26187

$(top_srcdir)/configure.in

26188

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26189

$(ACLOCAL_M4)

26190

@@ -210,6 +209,7 @@

26191

MIXER_LIBS = @MIXER_LIBS@

26192

MKDIR_P = @MKDIR_P@

26193

MKINSTALLDIRS = @MKINSTALLDIRS@

26194

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26195

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26196

MSGFMT = @MSGFMT@

26197

MSGFMT_OPTS = @MSGFMT_OPTS@

26198

@@ -241,11 +241,10 @@

26199

RANLIB = @RANLIB@

26200

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26201

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@

26202

+SED = @SED@

26203

SET_MAKE = @SET_MAKE@

26204

SHELL = @SHELL@

26205

-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@

26206

STRIP = @STRIP@

26207

-SU_TOOL = @SU_TOOL@

26208

SYSCONFDIR = @SYSCONFDIR@

26209

USE_NLS = @USE_NLS@

26210

VERSION = @VERSION@

26211

diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.4/trashapplet/src/Makefile.in gnome-applets-2.21.4.new/trashapplet/src/Makefile.in

26212

--- gnome-applets-2.21.4/trashapplet/src/Makefile.in 2008-01-14 20:49:43.000000000 +0100

26213

+++ gnome-applets-2.21.4.new/trashapplet/src/Makefile.in 2008-01-15 15:34:45.000000000 +0100

26214

@@ -39,7 +39,6 @@

26215

$(top_srcdir)/m4/acinclude.m4 \

26216

$(top_srcdir)/m4/gnome-doc-utils.m4 \

26217

$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \

26218

- $(top_srcdir)/m4/system-tools-backends.m4 \

26219

$(top_srcdir)/configure.in

26220

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

26221

$(ACLOCAL_M4)

26222

@@ -209,6 +208,7 @@

26223

MIXER_LIBS = @MIXER_LIBS@

26224

MKDIR_P = @MKDIR_P@

26225

MKINSTALLDIRS = @MKINSTALLDIRS@

26226

+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@

26227

MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@

26228

MSGFMT = @MSGFMT@

26229

MSGFMT_OPTS = @MSGFMT_OPTS@

26230

@@ -240,11 +240,10 @@

26390

26231

RANLIB = @RANLIB@

26391

26232

SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@

26392

26233

SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@